diff --git a/scripts/dashboards_render_atlas.py b/scripts/dashboards_render_atlas.py
index c96de608..b1e3ded8 100644
--- a/scripts/dashboards_render_atlas.py
+++ b/scripts/dashboards_render_atlas.py
@@ -669,24 +669,25 @@ def platform_check_status_expr(
         return f"last_over_time({metric}[{window}])" if window else metric
 
     build_info_metric = f'platform_quality_gate_build_info{{{suite_matcher},{PLATFORM_TEST_EXPORT_FILTER},{branch_matcher}}}'
-    build_info = (
-        f"max by (suite, branch) ("
-        f"{f'last_over_time({build_info_metric}[{window}])' if window else build_info_metric}"
-        f")"
-    )
-    with_status = (
-        maybe_recent(f"{base},{branch_matcher},{status_selector}")
+    build_info_sample = (
+        f"last_over_time({build_info_metric}[{window}])" if window else build_info_metric
     )
+    build_info = f"max by (suite, branch) ({build_info_sample})"
+    with_status_selector = f"{base},{branch_matcher},{status_selector}"
+    with_result_selector = f'{base},{branch_matcher},{result_selector},status=""'
+    inferred_status_selector = f'{base},branch="",{status_selector}'
+    inferred_result_selector = f'{base},branch="",{result_selector},status=""'
+    with_status = maybe_recent(with_status_selector)
     with_result = (
-        f'label_replace({maybe_recent(f'{base},{branch_matcher},{result_selector},status=""')}, '
+        f'label_replace({maybe_recent(with_result_selector)}, '
         f'"status", "$1", "result", "(.*)")'
     )
     inferred_status = (
-        f'({maybe_recent(f"{base},branch=\"\",{status_selector}")} '
+        f'({maybe_recent(inferred_status_selector)} '
         f'* on (suite) group_left(branch) ({build_info}))'
     )
     inferred_result = (
-        f'(label_replace({maybe_recent(f"{base},branch=\"\",{result_selector},status=\"\"")}, '
+        f'(label_replace({maybe_recent(inferred_result_selector)}, '
         f'"status", "$1", "result", "(.*)") '
         f'* on (suite) group_left(branch) ({build_info}))'
     )