diff --git a/values/umami/queries/grafana-weekly-users.sql b/values/umami/queries/grafana-weekly-grouped-users.sql
similarity index 100%
rename from values/umami/queries/grafana-weekly-users.sql
rename to values/umami/queries/grafana-weekly-grouped-users.sql
diff --git a/values/umami/queries/weekly-sim-submit-count-norm.sql b/values/umami/queries/weekly-sim-submit-count-norm.sql
index 671a69a2..5cd5151b 100644
--- a/values/umami/queries/weekly-sim-submit-count-norm.sql
+++ b/values/umami/queries/weekly-sim-submit-count-norm.sql
@@ -23,8 +23,8 @@ SELECT
   *
 FROM
   crosstab(
-    'SELECT "group", sim_type, count::text FROM weekly_sim_submit_count_v2 ORDER BY 1, 2',
-    'SELECT DISTINCT sim_type FROM weekly_sim_submit_count_v2 ORDER BY 1'
+    'SELECT "group", sim_type, count::text FROM weekly_sim_submit_count WHERE sim_type <> ''lice-network'' AND sim_type <> ''lice-delousing'' ORDER BY 1, 2',
+    'SELECT DISTINCT sim_type FROM weekly_sim_submit_count WHERE sim_type <> ''lice-network'' AND sim_type <> ''lice-delousing'' ORDER BY 1'
   ) AS ct (
     group_name text,
     lice bigint,
@@ -33,3 +33,9 @@ FROM
     virus bigint,
     watercontact bigint
   )
+WHERE
+  (lice + sedimentation + transport + virus + watercontact) <> 0
+  AND "group" <> '@oceanbox.io'
+ORDER BY
+  (lice + sedimentation + transport + virus + watercontact) DESC
+;
diff --git a/values/umami/queries/weekly-users.sql b/values/umami/queries/weekly-users.sql
index c5c8c99a..6d784b4e 100644
--- a/values/umami/queries/weekly-users.sql
+++ b/values/umami/queries/weekly-users.sql
@@ -9,9 +9,11 @@ WITH base AS (
   WHERE
     w.website_id = '16e7d807-4db5-45fd-92a9-27393445a153'
     AND w.event_type = 1
-    AND w.created_at BETWEEN '2025-10-13' AND '2025-10-19'
+    -- NOTE: This is only available in grafana
+    -- AND $__timeFilter(w.created_at)
+    AND w.created_at BETWEEN current_timestamp - '7 days'::interval and current_timestamp
     AND s.distinct_id IS NOT NULL
-    -- AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') IN ('@leroyseafood.com')
+    -- AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') IN ($groups)
 ),
 unique_totals AS (
   SELECT
@@ -28,9 +30,12 @@ unique_users AS (
   GROUP BY "Group"
 )
 SELECT
-	SUM("Users in range")
-FROM
-	unique_totals
+  t."Group",
+  t."Users in range" AS "Weekly users"
+FROM unique_totals t
+LEFT JOIN
+  unique_users u USING ("Group")
 WHERE
-	LOWER("Group") NOT IN ('@oceanbox.io')
-	;
+  t."Group" <> '@oceanbox.io'
+ORDER BY
+  "Users in range" DESC;
diff --git a/values/umami/queries/weekly.sql b/values/umami/queries/weekly.sql
index 7c172062..3bfb4f0c 100644
--- a/values/umami/queries/weekly.sql
+++ b/values/umami/queries/weekly.sql
@@ -14,6 +14,10 @@ WHERE
 	AND w.event_type = 1
 	AND s.distinct_id IS NOT NULL
 	AND substring(s.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') <> '@oceanbox.io'
+	AND 2025 < EXTRACT(YEAR FROM w.created_at) 
+	-- NOTE(simkir): We started with umami at this time, so the data that week was not complete
+	AND (NOT (EXTRACT(YEAR FROM w.created_at) = 2025 AND EXTRACT(WEEK FROM w.created_at) = 37))
+	AND (NOT (EXTRACT(YEAR FROM w.created_at) = 2025 AND EXTRACT(WEEK FROM w.created_at) = 1))
 GROUP BY
   week
 ORDER BY