diff --git a/web/frontend/src/Job.root.svelte b/web/frontend/src/Job.root.svelte
index b641a43..f2df916 100644
--- a/web/frontend/src/Job.root.svelte
+++ b/web/frontend/src/Job.root.svelte
@@ -130,7 +130,7 @@
     const pendingMetrics = [
       ...(ccconfig[`job_view_selectedMetrics:${job.cluster}`] ||
       $initq.data.globalMetrics.reduce((names, gm) => {
-          if (gm.availability.find((av) => av.cluster === job.cluster)) {
+          if (gm.availability.find((av) => av.cluster === job.cluster && av.subClusters.includes(job.subCluster))) {
             names.push(gm.name);
           }
           return names;
@@ -434,6 +434,7 @@
 {#if $initq.data}
   <MetricSelection
     cluster={$initq.data.job.cluster}
+    subCluster={$initq.data.job.subCluster}
     configName="job_view_selectedMetrics"
     bind:metrics={selectedMetrics}
     bind:isOpen={isMetricsSelectionOpen}
diff --git a/web/frontend/src/generic/select/MetricSelection.svelte b/web/frontend/src/generic/select/MetricSelection.svelte
index 71b42b8..8cbfc67 100644
--- a/web/frontend/src/generic/select/MetricSelection.svelte
+++ b/web/frontend/src/generic/select/MetricSelection.svelte
@@ -28,6 +28,7 @@
   export let configName;
   export let allMetrics = null;
   export let cluster = null;
+  export let subCluster = null;
   export let showFootprint = false;
   export let footprintSelect = false;
 
@@ -51,7 +52,11 @@
       } else {
         allMetrics.clear();
         for (let gm of globalMetrics) {
-          if (gm.availability.find((av) => av.cluster === cluster)) allMetrics.add(gm.name);
+          if (subCluster == null) {
+            if (gm.availability.find((av) => av.cluster === cluster)) allMetrics.add(gm.name);
+          } else {
+            if (gm.availability.find((av) => av.cluster === cluster && av.subClusters.includes(subCluster))) allMetrics.add(gm.name);
+          }
         }
       }
       newMetricsOrder = [...allMetrics].filter((m) => !metrics.includes(m));
diff --git a/web/frontend/src/systems/nodelist/NodeListRow.svelte b/web/frontend/src/systems/nodelist/NodeListRow.svelte
index 07e5556..5202573 100644
--- a/web/frontend/src/systems/nodelist/NodeListRow.svelte
+++ b/web/frontend/src/systems/nodelist/NodeListRow.svelte
@@ -102,8 +102,8 @@
     if ($nodeJobsData.data.jobs.count >= 1) { // "&& !$nodeJobsData.data.jobs.items[0].exclusive)"
       const accSet = Array.from(new Set($nodeJobsData.data.jobs.items
         .map((i) => i.resources
-          .filter((r) => r.hostname === nodeData.host)
-          .map((r) => r.accelerators)
+          .filter((r) => (r.hostname === nodeData.host) && r?.accelerators)
+          .map((r) => r?.accelerators)
         )
       )).flat(2)