diff --git a/frontend b/frontend
index 63f98d1..cebc46c 160000
--- a/frontend
+++ b/frontend
@@ -1 +1 @@
-Subproject commit 63f98d12dd7c7cac3dbdc27e635d12f1ed4958df
+Subproject commit cebc46c58c892349429990ca30df1758b803e9cb
diff --git a/metricdata/cc-metric-store.go b/metricdata/cc-metric-store.go
index 5b9db37..0ccae91 100644
--- a/metricdata/cc-metric-store.go
+++ b/metricdata/cc-metric-store.go
@@ -497,7 +497,7 @@ func (ccms *CCMetricStore) LoadNodeData(cluster, partition string, metrics, node
 		metric := ccms.toLocalName(query.Metric)
 		qdata := res[0]
 		if qdata.Error != nil {
-			return nil, fmt.Errorf("fetching %s for node %s failed: %s", query.Metric, query.Hostname, *qdata.Error)
+			return nil, fmt.Errorf("fetching %s for node %s failed: %s", metric, query.Hostname, *qdata.Error)
 		}
 
 		if qdata.Avg.IsNaN() || qdata.Min.IsNaN() || qdata.Max.IsNaN() {
@@ -511,7 +511,7 @@ func (ccms *CCMetricStore) LoadNodeData(cluster, partition string, metrics, node
 		}
 
 		mc := config.GetMetricConfig(cluster, metric)
-		hostdata[query.Metric] = append(hostdata[query.Metric], &schema.JobMetric{
+		hostdata[metric] = append(hostdata[metric], &schema.JobMetric{
 			Unit:     mc.Unit,
 			Scope:    schema.MetricScopeNode,
 			Timestep: mc.Timestep,