diff --git a/QueryTemplate/city_daily_2g.sql b/QueryTemplate/city_daily_2g.sql
index 6b560ae..3ca2687 100644
--- a/QueryTemplate/city_daily_2g.sql
+++ b/QueryTemplate/city_daily_2g.sql
@@ -60,7 +60,7 @@ with master as (select m.date
                          join network_cell n on m.network_cell_id = n.id
                          join ref_site r on n.site_id = r.site_id
 
-                where m.date between date_int(1) and date_int(1)
+                where m.date between '2023-12-01' and '2023-12-07'
 --                   and n.region = 'PUMA'
 --                   and n.site_id in ('AMB002')
 
diff --git a/QueryTemplate/city_daily_4g.sql b/QueryTemplate/city_daily_4g.sql
index 1d9e3dc..7708f6f 100644
--- a/QueryTemplate/city_daily_4g.sql
+++ b/QueryTemplate/city_daily_4g.sql
@@ -154,7 +154,7 @@ with master as (select m.date
                          join network_cell n on m.network_cell_id = n.id
                          join ref_site r on n.site_id = r.site_id
 
-                where m.date between date_int(1) and date_int(1)
+                where m.date between '2023-12-01' and '2023-12-07'
 --                   and n.region = 'PUMA'
 --                   and n.site_id in ('AMB002')
 
diff --git a/QueryTemplate/city_daily_5g.sql b/QueryTemplate/city_daily_5g.sql
index 9de20e0..8c78557 100644
--- a/QueryTemplate/city_daily_5g.sql
+++ b/QueryTemplate/city_daily_5g.sql
@@ -72,7 +72,7 @@ with master as (select m.date
                          join network_cell n on m.network_cell_id = n.id
                          join ref_site r on n.site_id = r.site_id
 
-                where m.date between date_int(1) and date_int(1)
+                where m.date between '2023-12-01' and '2023-12-07'
 --                   and n.region = 'PUMA'
 --                   and n.site_id in ('AMB002')
 
diff --git a/QueryTemplate/site_daily_2g.sql b/QueryTemplate/site_daily_2g.sql
index 8b56f64..d08f82a 100644
--- a/QueryTemplate/site_daily_2g.sql
+++ b/QueryTemplate/site_daily_2g.sql
@@ -59,7 +59,7 @@ with master as (select m.date
                 from r11.meas_2g_daily m
                          join network_cell n on m.network_cell_id = n.id
 
-                where m.date between date_int(1) and date_int(1)
+                where m.date between '2023-12-01' and '2023-12-07'
 --                   and n.region = 'PUMA'
                   and n.site_id in ('AMB002')
 
diff --git a/QueryTemplate/site_daily_4g.sql b/QueryTemplate/site_daily_4g.sql
index 1e0b5dd..3b597e4 100644
--- a/QueryTemplate/site_daily_4g.sql
+++ b/QueryTemplate/site_daily_4g.sql
@@ -153,7 +153,7 @@ with master as (select m.date
                 from r11.meas_4g_daily m
                          join network_cell n on m.network_cell_id = n.id
 
-                where m.date between date_int(1) and date_int(1)
+                where m.date between '2023-12-01' and '2023-12-07'
 --                   and n.region = 'PUMA'
                   and n.site_id in ('AMB002')
 
diff --git a/QueryTemplate/site_daily_5g.sql b/QueryTemplate/site_daily_5g.sql
index f547071..b317680 100644
--- a/QueryTemplate/site_daily_5g.sql
+++ b/QueryTemplate/site_daily_5g.sql
@@ -71,7 +71,7 @@ with master as (select m.date
                 from r11.meas_5g_daily m
                          join network_cell n on m.network_cell_id = n.id
 
-                where m.date between date_int(1) and date_int(1)
+                where m.date between '2023-12-01' and '2023-12-07'
 --                   and n.region = 'PUMA'
 --                   and n.site_id in ('AMB002')
 
diff --git a/QueryTemplate/site_packet_loss_2g.sql b/QueryTemplate/site_packet_loss_2g.sql
index 175f402..3160f7e 100644
--- a/QueryTemplate/site_packet_loss_2g.sql
+++ b/QueryTemplate/site_packet_loss_2g.sql
@@ -6,7 +6,7 @@ select datetime
      , avg(rate_of_lost_detected_packet_1_div_10000) as rate_of_lost_detected_packet_1_div_10000
 from r11.pl_2g_hourly p
          join network_site n on p.network_site_id = n.id
-where date between date_int(7) and date_int(1)
+where date between '2023-12-01' and '2023-12-07'
 group by datetime
        , n.site_id
 order by n.site_id
diff --git a/QueryTemplate/site_packet_loss_4g.sql b/QueryTemplate/site_packet_loss_4g.sql
index 15733f0..a06331a 100644
--- a/QueryTemplate/site_packet_loss_4g.sql
+++ b/QueryTemplate/site_packet_loss_4g.sql
@@ -5,7 +5,7 @@ select datetime
      , avg(average_jitter_of_twamp_detecting_link_ms) as average_jitter_of_twamp_detecting_link_ms
 from r11.pl_4g_15min p
          join network_site n on p.network_site_id = n.id
-where date between date_int(7) and date_int(1)
+where date between '2023-12-01' and '2023-12-07'
 group by datetime
        , n.site_id
 order by n.site_id
diff --git a/Request/PUMA/Robert/branch_cluster_productivity.sql b/Request/PUMA/Robert/branch_cluster_productivity.sql
index 5b89af1..f3a0faa 100644
--- a/Request/PUMA/Robert/branch_cluster_productivity.sql
+++ b/Request/PUMA/Robert/branch_cluster_productivity.sql
@@ -1,7 +1,6 @@
 with datarange as (select date
                    from w
-                   where date between date_from(to_week(date_int(7)))
-                             and date_to(to_week(date_int(7)))),
+                   where date between '2023-12-01' and '2023-12-07'),
      master as (select '2G'                        as tech,
                        raw.date                    as datetime,
                        ref.branch,