diff --git a/libs/common/src/sql/queries/fact_hourly_energy_consumed/fact_hourly_energy_consumed.sql b/libs/common/src/sql/queries/fact_hourly_energy_consumed/fact_hourly_energy_consumed.sql
index c6dcf1d..c783a14 100644
--- a/libs/common/src/sql/queries/fact_hourly_energy_consumed/fact_hourly_energy_consumed.sql
+++ b/libs/common/src/sql/queries/fact_hourly_energy_consumed/fact_hourly_energy_consumed.sql
@@ -23,8 +23,8 @@ total_energy AS (
       AND (params.input_date IS NULL OR log.event_time::date >= params.input_date)
       AND (params.input_date IS NULL OR log.event_time::date <= params.input_date)
       AND (params.hour IS NULL OR EXTRACT(HOUR FROM log.event_time) = params.hour)
-      AND (params.event_month IS NULL OR log.event_month = params.event_month)
-      AND (params.event_year IS NULL OR log.event_year = params.event_year)
+      AND (params.event_month IS NULL OR TO_CHAR(log.event_time, 'MM-YYYY') = params.event_month)
+      AND (params.event_year IS NULL OR EXTRACT(YEAR FROM log.event_time)::int = params.event_year)
     GROUP BY 1,2,3,4,5
 ),
 
@@ -43,8 +43,8 @@ energy_phase_A AS (
       AND (params.input_date IS NULL OR log.event_time::date >= params.input_date)
       AND (params.input_date IS NULL OR log.event_time::date <= params.input_date)
       AND (params.hour IS NULL OR EXTRACT(HOUR FROM log.event_time) = params.hour)
-      AND (params.event_month IS NULL OR log.event_month = params.event_month)
-      AND (params.event_year IS NULL OR log.event_year = params.event_year)
+      AND (params.event_month IS NULL OR TO_CHAR(log.event_time, 'MM-YYYY') = params.event_month)
+      AND (params.event_year IS NULL OR EXTRACT(YEAR FROM log.event_time)::int = params.event_year)
     GROUP BY 1,2,3,4,5
 ),
 
@@ -63,8 +63,8 @@ energy_phase_B AS (
       AND (params.input_date IS NULL OR log.event_time::date >= params.input_date)
       AND (params.input_date IS NULL OR log.event_time::date <= params.input_date)
       AND (params.hour IS NULL OR EXTRACT(HOUR FROM log.event_time) = params.hour)
-      AND (params.event_month IS NULL OR log.event_month = params.event_month)
-      AND (params.event_year IS NULL OR log.event_year = params.event_year)
+      AND (params.event_month IS NULL OR TO_CHAR(log.event_time, 'MM-YYYY') = params.event_month)
+      AND (params.event_year IS NULL OR EXTRACT(YEAR FROM log.event_time)::int = params.event_year)
     GROUP BY 1,2,3,4,5
 ),
 
@@ -83,8 +83,8 @@ energy_phase_C AS (
       AND (params.input_date IS NULL OR log.event_time::date >= params.input_date)
       AND (params.input_date IS NULL OR log.event_time::date <= params.input_date)
       AND (params.hour IS NULL OR EXTRACT(HOUR FROM log.event_time) = params.hour)
-      AND (params.event_month IS NULL OR log.event_month = params.event_month)
-      AND (params.event_year IS NULL OR log.event_year = params.event_year)
+      AND (params.event_month IS NULL OR TO_CHAR(log.event_time, 'MM-YYYY') = params.event_month)
+      AND (params.event_year IS NULL OR EXTRACT(YEAR FROM log.event_time)::int = params.event_year)
     GROUP BY 1,2,3,4,5
 )