diff --git a/web/frontend/src/Job.root.svelte b/web/frontend/src/Job.root.svelte
index f2df916..6980230 100644
--- a/web/frontend/src/Job.root.svelte
+++ b/web/frontend/src/Job.root.svelte
@@ -128,15 +128,24 @@
     if (!job) return;
 
     const pendingMetrics = [
-      ...(ccconfig[`job_view_selectedMetrics:${job.cluster}`] ||
-      $initq.data.globalMetrics.reduce((names, gm) => {
-          if (gm.availability.find((av) => av.cluster === job.cluster && av.subClusters.includes(job.subCluster))) {
-            names.push(gm.name);
-          }
-          return names;
-        }, [])
+      ...(
+        (
+          ccconfig[`job_view_selectedMetrics:${job.cluster}:${job.subCluster}`] ||
+          ccconfig[`job_view_selectedMetrics:${job.cluster}`]
+        ) ||
+        $initq.data.globalMetrics
+          .reduce((names, gm) => {
+            if (gm.availability.find((av) => av.cluster === job.cluster && av.subClusters.includes(job.subCluster))) {
+              names.push(gm.name);
+            }
+            return names;
+          }, [])
       ),
-      ...(ccconfig[`job_view_nodestats_selectedMetrics:${job.cluster}`] ||
+      ...(
+        (
+          ccconfig[`job_view_nodestats_selectedMetrics:${job.cluster}:${job.subCluster}`] ||
+          ccconfig[`job_view_nodestats_selectedMetrics:${job.cluster}`]
+        ) ||
         ccconfig[`job_view_nodestats_selectedMetrics`]
       ),
     ];
diff --git a/web/frontend/src/Jobs.root.svelte b/web/frontend/src/Jobs.root.svelte
index df928d0..7faa8b8 100644
--- a/web/frontend/src/Jobs.root.svelte
+++ b/web/frontend/src/Jobs.root.svelte
@@ -137,5 +137,5 @@
   bind:metrics
   bind:isOpen={isMetricsSelectionOpen}
   bind:showFootprint
-  footprintSelect={true}
+  footprintSelect
 />
diff --git a/web/frontend/src/Systems.root.svelte b/web/frontend/src/Systems.root.svelte
index 8089bbe..1589cac 100644
--- a/web/frontend/src/Systems.root.svelte
+++ b/web/frontend/src/Systems.root.svelte
@@ -29,8 +29,8 @@
   import Refresher from "./generic/helper/Refresher.svelte";
 
   export let displayType;
-  export let cluster;
-  export let subCluster = "";
+  export let cluster = null;
+  export let subCluster = null;
   export let from = null;
   export let to = null;
 
@@ -60,7 +60,10 @@
   let hostnameFilter = "";
   let pendingHostnameFilter = "";
   let selectedMetric = ccconfig.system_view_selectedMetric || "";
-  let selectedMetrics = ccconfig[`node_list_selectedMetrics:${cluster}`] || [ccconfig.system_view_selectedMetric];
+  let selectedMetrics = (
+    ccconfig[`node_list_selectedMetrics:${cluster}:${subCluster}`] ||
+    ccconfig[`node_list_selectedMetrics:${cluster}`]
+  ) || [ccconfig.system_view_selectedMetric];
   let isMetricsSelectionOpen = false;
 
   /*
@@ -191,6 +194,7 @@
 
 <MetricSelection
   {cluster}
+  {subCluster}
   configName="node_list_selectedMetrics"
   metrics={selectedMetrics}
   bind:isOpen={isMetricsSelectionOpen}
diff --git a/web/frontend/src/User.root.svelte b/web/frontend/src/User.root.svelte
index 0e6a5b8..9b6e15a 100644
--- a/web/frontend/src/User.root.svelte
+++ b/web/frontend/src/User.root.svelte
@@ -352,7 +352,7 @@
   bind:metrics
   bind:isOpen={isMetricsSelectionOpen}
   bind:showFootprint
-  footprintSelect={true}
+  footprintSelect
 />
 
 <HistogramSelection
diff --git a/web/frontend/src/generic/select/MetricSelection.svelte b/web/frontend/src/generic/select/MetricSelection.svelte
index 8cbfc67..da0b340 100644
--- a/web/frontend/src/generic/select/MetricSelection.svelte
+++ b/web/frontend/src/generic/select/MetricSelection.svelte
@@ -47,12 +47,12 @@
 
   $: {
     if (allMetrics != null) {
-      if (cluster == null) {
+      if (!cluster) {
         for (let metric of globalMetrics) allMetrics.add(metric.name);
       } else {
         allMetrics.clear();
         for (let gm of globalMetrics) {
-          if (subCluster == null) {
+          if (!subCluster) {
             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);
@@ -67,7 +67,7 @@
 
   function printAvailability(metric, cluster) {
     const avail = globalMetrics.find((gm) => gm.name === metric)?.availability
-    if (cluster == null) {
+    if (!cluster) {
       return avail.map((av) => av.cluster).join(',')
     } else {
       return avail.find((av) => av.cluster === cluster).subClusters.join(',')
@@ -112,10 +112,17 @@
     metrics = newMetricsOrder.filter((m) => unorderedMetrics.includes(m));
     isOpen = false;
 
-    showFootprint = !!pendingShowFootprint;
+    let configKey;
+    if (cluster && subCluster) {
+      configKey = `${configName}:${cluster}:${subCluster}`;
+    } else if (cluster && !subCluster) {
+      configKey = `${configName}:${cluster}`;
+    } else {
+      configKey = `${configName}`;
+    }
 
     updateConfigurationMutation({
-      name: cluster == null ? configName : `${configName}:${cluster}`,
+      name: configKey,
       value: JSON.stringify(metrics),
     }).subscribe((res) => {
       if (res.fetching === false && res.error) {
@@ -123,17 +130,20 @@
       }
     });
 
-    updateConfigurationMutation({
-      name:
-        cluster == null
-          ? "plot_list_showFootprint"
-          : `plot_list_showFootprint:${cluster}`,
-      value: JSON.stringify(showFootprint),
-    }).subscribe((res) => {
-      if (res.fetching === false && res.error) {
-        throw res.error;
-      }
-    });
+    if (footprintSelect) {
+      showFootprint = !!pendingShowFootprint;
+      updateConfigurationMutation({
+        name:
+          !cluster
+            ? "plot_list_showFootprint"
+            : `plot_list_showFootprint:${cluster}`,
+        value: JSON.stringify(showFootprint),
+      }).subscribe((res) => {
+        if (res.fetching === false && res.error) {
+          throw res.error;
+        }
+      });
+    };
 
     dispatch('update-metrics', metrics);
   }
diff --git a/web/frontend/src/job/StatsTable.svelte b/web/frontend/src/job/StatsTable.svelte
index b6b0f85..c8f12f2 100644
--- a/web/frontend/src/job/StatsTable.svelte
+++ b/web/frontend/src/job/StatsTable.svelte
@@ -37,9 +37,10 @@
     sorting = {},
     isMetricSelectionOpen = false,
     availableMetrics = new Set(),
-    selectedMetrics =
-      getContext("cc-config")[`job_view_nodestats_selectedMetrics:${job.cluster}`] ||
-      getContext("cc-config")["job_view_nodestats_selectedMetrics"];
+    selectedMetrics = (
+      getContext("cc-config")[`job_view_nodestats_selectedMetrics:${job.cluster}:${job.subCluster}`] ||
+      getContext("cc-config")[`job_view_nodestats_selectedMetrics:${job.cluster}`]
+    ) || getContext("cc-config")["job_view_nodestats_selectedMetrics"];
 
   for (let metric of sortedJobMetrics) {
     // Not Exclusive or Multi-Node: get maxScope directly (mostly: node)
diff --git a/web/frontend/src/systems/NodeList.svelte b/web/frontend/src/systems/NodeList.svelte
index ad64a1f..ca22d57 100644
--- a/web/frontend/src/systems/NodeList.svelte
+++ b/web/frontend/src/systems/NodeList.svelte
@@ -217,13 +217,15 @@
           <tr>
             <td colspan={selectedMetrics.length + 1}>
               <div style="text-align:center;">
-                <p><b>
-                  Loading nodes {nodes.length + 1} to 
-                  { matchedNodes 
-                    ? `${(nodes.length + paging.itemsPerPage) > matchedNodes ? matchedNodes : (nodes.length + paging.itemsPerPage)} of ${matchedNodes} total`
-                    : (nodes.length + paging.itemsPerPage)
-                  }
-                </b></p>
+                {#if !usePaging}
+                  <p><b>
+                    Loading nodes {nodes.length + 1} to 
+                    { matchedNodes 
+                      ? `${(nodes.length + paging.itemsPerPage) > matchedNodes ? matchedNodes : (nodes.length + paging.itemsPerPage)} of ${matchedNodes} total`
+                      : (nodes.length + paging.itemsPerPage)
+                    }
+                  </b></p>
+                {/if}
                 <Spinner secondary />
               </div>
             </td>