diff --git a/values/umami/queries/create-sim-count-view-v2.sql b/values/umami/queries/create-sim-count-view-v2.sql
deleted file mode 100644
index 829f42b3..00000000
--- a/values/umami/queries/create-sim-count-view-v2.sql
+++ /dev/null
@@ -1,56 +0,0 @@
--- NOTE(simkir): Materialized view called by the crosstab to pivot sim types to cols
-create materialized view weekly_sim_submit_count_v2 as
-  with
-  -- NOTE(simkir): Select all groups and sim kinds
-  group_and_sims as (
-    select
-      "group",
-      sim_type
-    from
-      (
-        select substring(distinct_id similar '%#"@%#"' escape '#') as group
-        from session
-        where distinct_id is not null and distinct_id like '%@%'
-        group by substring(distinct_id similar '%#"@%#"' escape '#')
-      )
-      cross join
-      (
-        select distinct string_value as sim_type
-        from event_data
-        where event_data.data_key = 'kind'
-      )
-  ),
-  events as (
-    select
-      substring(session.distinct_id similar '%#"@%#"' escape '#') as group,
-      event_data.string_value as sim_type,
-      event_data.website_event_id as event_id,
-      event_data.created_at
-    from
-      website_event
-      join session on session.session_id = website_event.session_id
-      left outer join event_data on event_data.website_event_id = website_event.event_id
-    where
-      website_event.website_id = '16e7d807-4db5-45fd-92a9-27393445a153'
-      and website_event.event_type = 2
-      and website_event.event_name = 'mapster-submit-drifters'
-      and event_data.data_key = 'kind'
-  )
-
-  select
-    group_and_sims.group,
-    group_and_sims.sim_type,
-    count(events.event_id)
-  from
-    group_and_sims
-    -- NOTE(simkir): Allow missing events
-    left outer join events on
-      -- NOTE(simkir): Join on the unique combinations of group name and sim
-      -- kind which we've already fetched in `group_and_sims`.
-      events.group = group_and_sims.group
-      and events.sim_type = group_and_sims.sim_type
-      -- NOTE(simkir): Filter here in the join to, again, allow missing rows
-      and events.created_at between current_timestamp - '7 days'::interval and current_timestamp
-  group by
-    group_and_sims.group,
-    group_and_sims.sim_type
diff --git a/values/umami/queries/create-sim-count-view.sql b/values/umami/queries/create-sim-count-view.sql
index cf0db374..d0386619 100644
--- a/values/umami/queries/create-sim-count-view.sql
+++ b/values/umami/queries/create-sim-count-view.sql
@@ -1,20 +1,56 @@
 -- NOTE(simkir): Materialized view called by the crosstab to pivot sim types to cols
-CREATE MATERIALIZED VIEW weekly_sim_submit_count AS
-  SELECT
-    substring(session.distinct_id SIMILAR '%#"@%#"' ESCAPE '#') AS group,
-    event_data.string_value as sim_type,
-    COUNT(*)
-  FROM
-    website_event
-    JOIN session ON session.session_id = website_event.session_id
-    LEFT OUTER JOIN event_data ON event_data.website_event_id = website_event.event_id
-  WHERE
-    website_event.website_id = '16e7d807-4db5-45fd-92a9-27393445a153'
-    AND website_event.event_type = 2
-    AND website_event.event_name = 'mapster-submit-drifters'
-    AND session.distinct_id IS NOT NULL
-    AND event_data.data_key = 'kind'
-    AND event_data.created_at BETWEEN CURRENT_TIMESTAMP - '7 days'::interval AND CURRENT_TIMESTAMP
-  GROUP BY
-    substring(session.distinct_id SIMILAR '%#"@%#"' ESCAPE '#'),
-    event_data.string_value;
+create view weekly_sim_submit_count as
+  with
+  -- NOTE(simkir): Select all groups and sim kinds
+  group_and_sims as (
+    select
+      "group",
+      sim_type
+    from
+      (
+        select substring(distinct_id similar '%#"@%#"' escape '#') as group
+        from session
+        where distinct_id is not null and distinct_id like '%@%'
+        group by substring(distinct_id similar '%#"@%#"' escape '#')
+      )
+      cross join
+      (
+        select distinct string_value as sim_type
+        from event_data
+        where event_data.data_key = 'kind'
+      )
+  ),
+  events as (
+    select
+      substring(session.distinct_id similar '%#"@%#"' escape '#') as group,
+      event_data.string_value as sim_type,
+      event_data.website_event_id as event_id,
+      event_data.created_at
+    from
+      website_event
+      join session on session.session_id = website_event.session_id
+      left outer join event_data on event_data.website_event_id = website_event.event_id
+    where
+      website_event.website_id = '16e7d807-4db5-45fd-92a9-27393445a153'
+      and website_event.event_type = 2
+      and website_event.event_name = 'mapster-submit-drifters'
+      and event_data.data_key = 'kind'
+  )
+
+  select
+    group_and_sims.group,
+    group_and_sims.sim_type,
+    count(events.event_id)
+  from
+    group_and_sims
+    -- NOTE(simkir): Allow missing events
+    left outer join events on
+      -- NOTE(simkir): Join on the unique combinations of group name and sim
+      -- kind which we've already fetched in `group_and_sims`.
+      events.group = group_and_sims.group
+      and events.sim_type = group_and_sims.sim_type
+      -- NOTE(simkir): Filter here in the join to, again, allow missing rows
+      and events.created_at between current_timestamp - '7 days'::interval and current_timestamp
+  group by
+    group_and_sims.group,
+    group_and_sims.sim_type