diff --git a/fact_daily_subspace_occupancy/fact_daily_subspace_occupancy.sql b/fact_daily_subspace_occupancy/fact_daily_subspace_occupancy.sql
index 86bebdf..01ac8f3 100644
--- a/fact_daily_subspace_occupancy/fact_daily_subspace_occupancy.sql
+++ b/fact_daily_subspace_occupancy/fact_daily_subspace_occupancy.sql
@@ -1,17 +1,20 @@
 SELECT device.subspace_id AS subspace_id,
 		device.space_device_uuid as space_id,
-		subspace.subspace_name ,
+		space.space_name ,
+		subspace.subspace_name,
+		device.uuid,
 		"device-status-log".event_time::date as date,
 		count(distinct device.uuid) AS count_device,
         SUM(case when "device-status-log".value in ('presence','motion') then 1 else 0 END) as count_presence_detected
     FROM device
-    LEFT JOIN "device-status-log"
+    INNER JOIN "device-status-log"
         ON device.uuid::text = "device-status-log".device_id
     LEFT JOIN product
         ON product.uuid = device.product_device_uuid
-    inner join subspace
+    INNER join subspace
     	on subspace."uuid" = device.subspace_id
-    WHERE product.cat_name = 'hps'
-      AND "device-status-log".code = 'presence_state'
-    group by 1,2,3,4
+    inner join "space" 
+    	on space."uuid" = device.space_device_uuid
+    WHERE "device-status-log".code = 'presence_state'
+    group by 1,2,3,4,5,6
    
\ No newline at end of file