diff --git a/web/frontend/src/DashPublic.root.svelte b/web/frontend/src/DashPublic.root.svelte
index c9e0523c..4a26befb 100644
--- a/web/frontend/src/DashPublic.root.svelte
+++ b/web/frontend/src/DashPublic.root.svelte
@@ -185,7 +185,7 @@
       from: from.toISOString(),
       clusterFrom: clusterFrom.toISOString(),
       to: to.toISOString(),
-      jobFilter: [{ state: ["running"] }, { cluster: { eq: presetCluster } }],
+      jobFilter: [{ cluster: { eq: presetCluster } }, { state: ["running"] }],
       nodeFilter: { cluster: { eq: presetCluster }},
       paging: { itemsPerPage: -1, page: 1 }, // Get all: -1
       sorting: { field: "startTime", type: "col", order: "DESC" }
diff --git a/web/frontend/src/Node.root.svelte b/web/frontend/src/Node.root.svelte
index db424a2f..a9ce8a74 100644
--- a/web/frontend/src/Node.root.svelte
+++ b/web/frontend/src/Node.root.svelte
@@ -119,8 +119,8 @@
 
   const filter = $derived([
     { cluster: { eq: cluster } },
-    { node: { eq: hostname } },
     { state: ["running"] },
+    { node: { eq: hostname } },
   ]);
 
   const systemUnits = $derived.by(() => {
diff --git a/web/frontend/src/status/DashInternal.svelte b/web/frontend/src/status/DashInternal.svelte
index 145ac4dc..d537e84e 100644
--- a/web/frontend/src/status/DashInternal.svelte
+++ b/web/frontend/src/status/DashInternal.svelte
@@ -190,7 +190,7 @@
       from: from.toISOString(),
       to: to.toISOString(),
       clusterFrom: clusterFrom.toISOString(),
-      jobFilter: [{ state: ["running"] }, { cluster: { eq: presetCluster } }],
+      jobFilter: [{ cluster: { eq: presetCluster } }, { state: ["running"] }],
       paging: { itemsPerPage: -1, page: 1 }, // Get all: -1
       sorting: { field: "startTime", type: "col", order: "DESC" }
     },
@@ -216,7 +216,7 @@
       }
     `,
     variables: {
-      filter: [{ state: ["running"] }, { cluster: { eq: presetCluster} }],
+      filter: [{ cluster: { eq: presetCluster} }, { state: ["running"] }],
       paging: pagingState // Top 10
     },
     requestPolicy: "network-only"
diff --git a/web/frontend/src/status/dashdetails/StatisticsDash.svelte b/web/frontend/src/status/dashdetails/StatisticsDash.svelte
index d83adc15..6c0e17fc 100644
--- a/web/frontend/src/status/dashdetails/StatisticsDash.svelte
+++ b/web/frontend/src/status/dashdetails/StatisticsDash.svelte
@@ -72,7 +72,7 @@
       }
     `,
     variables: {
-      filter: [{ state: ["running"] }, { cluster: { eq: cluster} }],
+      filter: [{ cluster: { eq: cluster} }, { state: ["running"] }],
       selectedHistograms: selectedHistograms
     },
     requestPolicy: "network-only"
diff --git a/web/frontend/src/status/dashdetails/StatusDash.svelte b/web/frontend/src/status/dashdetails/StatusDash.svelte
index 0c2626d0..7bcbb017 100644
--- a/web/frontend/src/status/dashdetails/StatusDash.svelte
+++ b/web/frontend/src/status/dashdetails/StatusDash.svelte
@@ -179,7 +179,7 @@
       metrics: ["flops_any", "mem_bw"], // Fixed names for roofline and status bars
       from: from.toISOString(),
       to: to.toISOString(),
-      jobFilter: [{ state: ["running"] }, { cluster: { eq: cluster } }],
+      jobFilter: [{ cluster: { eq: cluster } }, { state: ["running"] }],
       nodeFilter: { cluster: { eq: cluster }},
       paging: { itemsPerPage: -1, page: 1 }, // Get all: -1
       sorting: { field: "startTime", type: "col", order: "DESC" }
diff --git a/web/frontend/src/status/dashdetails/UsageDash.svelte b/web/frontend/src/status/dashdetails/UsageDash.svelte
index 2a9b3037..5b0e67fe 100644
--- a/web/frontend/src/status/dashdetails/UsageDash.svelte
+++ b/web/frontend/src/status/dashdetails/UsageDash.svelte
@@ -60,8 +60,8 @@
   const canvasPrefix = $derived(`${presetCluster}-${presetSubCluster ? presetSubCluster : ''}`)
 
   const statusFilter = $derived(presetSubCluster
-      ? [{ state: ["running"] }, { cluster: { eq: presetCluster} }, { subCluster: { eq: presetSubCluster } }]
-      : [{ state: ["running"] }, { cluster: { eq: presetCluster} }] 
+      ? [{ cluster: { eq: presetCluster} }, { subCluster: { eq: presetSubCluster } }, { state: ["running"] }]
+      : [{ cluster: { eq: presetCluster} }, { state: ["running"] }] 
   );
   const topJobsQuery = $derived(loadMe ? queryStore({
     client: client,
diff --git a/web/frontend/src/systems/nodelist/NodeListRow.svelte b/web/frontend/src/systems/nodelist/NodeListRow.svelte
index 558d0642..62b6517b 100644
--- a/web/frontend/src/systems/nodelist/NodeListRow.svelte
+++ b/web/frontend/src/systems/nodelist/NodeListRow.svelte
@@ -63,8 +63,8 @@
   /* Derived */
   const filter = $derived([
     { cluster: { eq: cluster } },
-    { node: { contains: nodeData.host } },
     { state: ["running"] },
+    { node: { contains: nodeData.host } },
   ]);
   const nodeJobsData = $derived(queryStore({
       client: client,