diff --git a/jetstream/macos-background-tab-power-savings.toml b/jetstream/macos-background-tab-power-savings.toml
index 322e69fea..33d7fc071 100644
--- a/jetstream/macos-background-tab-power-savings.toml
+++ b/jetstream/macos-background-tab-power-savings.toml
@@ -1,29 +1,29 @@
 [metrics]
 
 overall = [
-	"fx_tab_switch_update_ms", 
-	"fx_tab_switch_total_e10s_ms", 
-	"fx_tab_switch_composite_e10s_ms", 
+	"fx_tab_switch_update_ms",
+	"fx_tab_switch_total_e10s_ms",
+	"fx_tab_switch_composite_e10s_ms",
 	"fx_tab_switch_spinner_visible_ms",
-	"fx_tab_switch_spinner_visible_long_ms", 
+	"fx_tab_switch_spinner_visible_long_ms",
 	"fx_tab_switch_spinner_visible_trigger",
-	"fx_tab_switch_request_tab_warming_state", 
+	"fx_tab_switch_request_tab_warming_state",
 	"fx_tab_click_ms",
 ]
 
 weekly = [
-	"fx_tab_switch_update_ms", 
-	"fx_tab_switch_total_e10s_ms", 
-	"fx_tab_switch_composite_e10s_ms", 
+	"fx_tab_switch_update_ms",
+	"fx_tab_switch_total_e10s_ms",
+	"fx_tab_switch_composite_e10s_ms",
 	"fx_tab_switch_spinner_visible_ms",
-	"fx_tab_switch_spinner_visible_long_ms", 
+	"fx_tab_switch_spinner_visible_long_ms",
 	"fx_tab_switch_spinner_visible_trigger",
-	"fx_tab_switch_request_tab_warming_state", 
+	"fx_tab_switch_request_tab_warming_state",
 	"fx_tab_click_ms",
 ]
 
 [metrics.fx_tab_switch_update_ms]
-data_source = "main"
+data_source = "main_filtered"
 select_expression = "{{agg_histogram_mean('payload.histograms.fx_tab_switch_update_ms')}}"
 
 friendly_name = "Fx Tab Switch Update Ms"
@@ -34,11 +34,8 @@ type = "histogram"
 [metrics.fx_tab_switch_update_ms.statistics.bootstrap_mean]
 
 
-
-
-
 [metrics.fx_tab_switch_spinner_visible_ms]
-data_source = "main"
+data_source = "main_filtered"
 select_expression = "{{agg_histogram_mean('payload.histograms.fx_tab_switch_spinner_visible_ms')}}"
 
 friendly_name = "Fx Tab Switch Spinner Visible Ms"
@@ -49,7 +46,7 @@ type = "histogram"
 [metrics.fx_tab_switch_spinner_visible_ms.statistics.bootstrap_mean]
 
 [metrics.fx_tab_switch_spinner_visible_long_ms]
-data_source = "main"
+data_source = "main_filtered"
 select_expression = "{{agg_histogram_mean('payload.histograms.fx_tab_switch_spinner_visible_long_ms')}}"
 
 friendly_name = "Fx Tab Switch Spinner Visible Long Ms"
@@ -60,7 +57,7 @@ type = "histogram"
 [metrics.fx_tab_switch_spinner_visible_long_ms.statistics.bootstrap_mean]
 
 [metrics.fx_tab_switch_spinner_visible_trigger]
-data_source = "main"
+data_source = "main_filtered"
 select_expression = "{{agg_histogram_mean('payload.histograms.fx_tab_switch_spinner_visible_trigger')}}"
 
 friendly_name = "Fx Tab Switch Spinner Visible Trigger"
@@ -71,7 +68,7 @@ type = "histogram"
 [metrics.fx_tab_switch_spinner_visible_trigger.statistics.bootstrap_mean]
 
 [metrics.fx_tab_switch_request_tab_warming_state]
-data_source = "main"
+data_source = "main_filtered"
 select_expression = "{{agg_histogram_mean('payload.histograms.fx_tab_switch_request_tab_warming_state')}}"
 
 friendly_name = "Fx Tab Switch Request Tab Warming State"
@@ -82,7 +79,7 @@ type = "histogram"
 [metrics.fx_tab_switch_request_tab_warming_state.statistics.bootstrap_mean]
 
 [metrics.fx_tab_click_ms]
-data_source = "main"
+data_source = "main_filtered"
 
 select_expression = "{{agg_histogram_mean('payload.histograms.fx_tab_click_ms')}}"
 
@@ -93,5 +90,41 @@ type = "histogram"
 
 [metrics.fx_tab_click_ms.statistics.bootstrap_mean]
 
-[metrics.fx_tab_switch_total_e10s_ms.statistics.bootstrap_mean]
+[metrics.fx_tab_switch_composite_e10s_ms]
+data_source = "main_filtered"
+
+select_expression = "{{agg_histogram_mean('payload.histograms.fx_tab_switch_composite_e10s_ms')}}"
+
+friendly_name = "Fx Tab Click Ms"
+description = "Firefox: Time in ms spent on switching tabs in response to a tab click."
+category = "performance"
+type = "histogram"
+
 [metrics.fx_tab_switch_composite_e10s_ms.statistics.bootstrap_mean]
+
+[metrics.fx_tab_switch_total_e10s_ms]
+data_source = "main_filtered"
+
+select_expression = "{{agg_histogram_mean('payload.histograms.fx_tab_switch_total_e10s_ms')}}"
+
+friendly_name = "Fx Tab Click Ms"
+description = "Firefox: Time in ms spent on switching tabs in response to a tab click."
+category = "performance"
+type = "histogram"
+
+[metrics.fx_tab_switch_total_e10s_ms.statistics.bootstrap_mean]
+
+
+[data_sources]
+[data_sources.main_filtered]
+from_expression = """(
+    SELECT
+        *,
+        DATE(submission_timestamp) AS submission_date,
+        environment.experiments
+    FROM `moz-fx-data-shared-prod.telemetry_stable.main_v5`
+    WHERE mozfun.map.get_key(environment.experiments, 'macos-background-tab-power-savings') IS NOT NULL
+)"""
+experiments_column_type = "native"
+friendly_name = "Main"
+description = "Main ping table"