diff --git a/models/core_/dim__orgs.sql b/models/core_/dim__orgs.sql
index e5634fb..242457c 100644
--- a/models/core_/dim__orgs.sql
+++ b/models/core_/dim__orgs.sql
@@ -5,14 +5,6 @@ WITH orgs AS (
         , MIN(event_timestamp) AS created_at
     FROM {{ ref('signed__in') }}
     GROUP BY 1
-
--- --dev
---    SELECT
---         org_id
---         , org_name
---         , employee_range
---         , created_at
---     FROM {{ ref('org__created') }}
 )
 
 , user_count AS (
@@ -28,7 +20,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 +28,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 c087cca..c298dd3 100644
--- a/models/core_/dim__users.sql
+++ b/models/core_/dim__users.sql
@@ -6,3 +6,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 b8ee7f8..7e9fc52 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 (