diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json
index 4f454c3bc..a8b0eb01b 100644
--- a/workload/portal-ui/portal-ui-baseline.json
+++ b/workload/portal-ui/portal-ui-baseline.json
@@ -1119,10 +1119,12 @@
                             },
                             "options": {
                                 "filter": {
-                                    "subscription": "onBasics",
-                                    "location": "[steps('SessionHosts').SessionHostsRegionSection.SessionHostsRegion.location.name]"
+                                    "subscription": "onBasics"
                                 }
-                            }
+                            },
+                            "scope": {
+                                "location": "[steps('sessionHosts').sessionHostsRegionSection.sessionHostsRegion]"
+                            }   
                         },
                         {
                             "name": "avdSubnetApi",