diff --git a/models/intermediate/kpis/int_kpis__product_new_dash_agg_metrics.sql b/models/intermediate/kpis/int_kpis__product_new_dash_agg_metrics.sql
index ea3a4dc..906c9e9 100644
--- a/models/intermediate/kpis/int_kpis__product_new_dash_agg_metrics.sql
+++ b/models/intermediate/kpis/int_kpis__product_new_dash_agg_metrics.sql
@@ -102,7 +102,7 @@ select
     d.date,
     'weekly' as time_granularity,
     d.dimension,
-    s.dimension_value,
+    d.dimension_value,
     coalesce(
         deals.deal_with_offered_service_count, 0
     ) as deal_with_offered_service_count,
@@ -119,7 +119,12 @@ select
     ) as total_chargeable_amount_in_gbp,
     coalesce(chargeable.unique_chargeable_bookings, 0) as unique_chargeable_bookings,
     coalesce(chargeable.unique_chargeable_listings, 0) as unique_chargeable_listings
-from int_kpis__agg_weekly_new_dash_created_services created
+from all_dates d
+left join
+    int_kpis__agg_weekly_new_dash_created_services created
+    on d.date = created.end_date
+    and d.dimension = created.dimension
+    and d.dimension_value = created.dimension_value
 left join
     int_kpis__agg_weekly_new_dash_chargeable_services chargeable
     on created.end_date = chargeable.end_date
@@ -140,7 +145,7 @@ select
     d.date,
     'monthly' as time_granularity,
     d.dimension,
-    s.dimension_value,
+    d.dimension_value,
     coalesce(
         deals.deal_with_offered_service_count, 0
     ) as deal_with_offered_service_count,
@@ -157,7 +162,12 @@ select
     ) as total_chargeable_amount_in_gbp,
     coalesce(chargeable.unique_chargeable_bookings, 0) as unique_chargeable_bookings,
     coalesce(chargeable.unique_chargeable_listings, 0) as unique_chargeable_listings
-from int_kpis__agg_monthly_new_dash_created_services created
+from all_dates d
+left join
+    int_kpis__agg_monthly_new_dash_created_services created
+    on d.date = created.end_date
+    and d.dimension = created.dimension
+    and d.dimension_value = created.dimension_value
 left join
     int_kpis__agg_monthly_new_dash_chargeable_services chargeable
     on created.end_date = chargeable.end_date
@@ -169,7 +179,7 @@ left join
     and created.dimension = deals.dimension
     and created.dimension_value = deals.dimension_value
 left join
+    int_kpis__agg_monthly_new_dash_accommodation_offered_services accommodation
     on created.end_date = accommodation.date
     and created.dimension = accommodation.dimension
     and created.dimension_value = accommodation.dimension_value
-    int_kpis__agg_monthly_new_dash_accommodation_offered_services accommodation