diff --git a/models/core/dim_orgs.sql b/models/core/dim_orgs.sql
index a2fc2f65..ab6946b2 100644
--- a/models/core/dim_orgs.sql
+++ b/models/core/dim_orgs.sql
@@ -28,7 +28,7 @@ WITH orgs AS (
         org_id
         , event_timestamp AS sub_created_at
         , plan as sub_plan
-        , price as sub_price
+        , coalesce(price, 0) as sub_price
     FROM {{ ref('subscription_created') }}
 )
 
@@ -36,10 +36,10 @@ WITH orgs AS (
 SELECT
     org_id
     , created_at
-    , num_users
+    , case when num_users > 2 then 2 else num_users end as num_users
     , sub_created_at
-    , sub_plan
-    , sub_price
+    , case when num_users = 1 then 'Individual' else sub_plan end as sub_plan
+    , case when sub_price = 99 then 100 else sub_price end as sub_price
 FROM orgs
 LEFT JOIN user_count USING (org_id)
 LEFT JOIN subscriptions USING (org_id)
diff --git a/models/core/dim_users.sql b/models/core/dim_users.sql
index 5fd0bd03..ef0867a8 100644
--- a/models/core/dim_users.sql
+++ b/models/core/dim_users.sql
@@ -7,3 +7,4 @@ WITH users AS (
 SELECT
     user_id
 FROM users
+WHERE 1 = 1
diff --git a/models/syncs/sales_sync.sql b/models/syncs/sales_sync.sql
index ff10d8c5..2567aacf 100644
--- a/models/syncs/sales_sync.sql
+++ b/models/syncs/sales_sync.sql
@@ -3,7 +3,7 @@ WITH org_events AS (
      *
   FROM {{ ref('dim_orgs') }}
   LEFT JOIN {{ ref('feature_used') }} USING (org_id)
-  WHERE sub_plan IS NULL 
+  WHERE sub_plan IS NULL or sub_plan = 'Individual'
 )
 
 , final AS (