diff --git a/salt/common/grafana/grafana_dashboards/storage_nodes/sensor.json b/salt/common/grafana/grafana_dashboards/storage_nodes/storage.json
similarity index 99%
rename from salt/common/grafana/grafana_dashboards/storage_nodes/sensor.json
rename to salt/common/grafana/grafana_dashboards/storage_nodes/storage.json
index 4ecddbd90..91e360529 100644
--- a/salt/common/grafana/grafana_dashboards/storage_nodes/sensor.json
+++ b/salt/common/grafana/grafana_dashboards/storage_nodes/storage.json
@@ -1241,7 +1241,7 @@
               },
               {
                 "params": [
-                  " / 100"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -1372,7 +1372,7 @@
               },
               {
                 "params": [
-                  " / 100"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -1503,7 +1503,7 @@
               },
               {
                 "params": [
-                  " / 100"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -2127,7 +2127,7 @@
               },
               {
                 "params": [
-                  " / 100"
+                  " / {{ CPUS }}"
                 ],
                 "type": "math"
               }
@@ -3934,6 +3934,6 @@
   },
   "timezone": "browser",
   "title": "Forward Node - {{ SERVERNAME }} Overview",
-  "uid": "yMeBEqfmz",
+  "uid": "{{ UID }}",
   "version": 25
 }
diff --git a/salt/common/init.sls b/salt/common/init.sls
index f4edc2c9f..25f715ab3 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -321,7 +321,7 @@ dashboard-{{ SN }}:
     - user: 939
     - group: 939
     - template: jinja
-    - source: salt://common/grafana/grafana_dashboards/sensor.json
+    - source: salt://common/grafana/grafana_dashboards/storage_nodes/storage.json
     - defaults:
       SERVERNAME: {{ SN }}
       MANINT: {{ SNDATA.manint }}
diff --git a/salt/utility/bin/crossthestreams.sh b/salt/utility/bin/crossthestreams.sh
index 2e2ef2fce..b9c8f6c1d 100644
--- a/salt/utility/bin/crossthestreams.sh
+++ b/salt/utility/bin/crossthestreams.sh
@@ -30,7 +30,7 @@ echo "Applying cross cluster search config..."
          -d "{\"persistent\": {\"search\": {\"remote\": {\"{{ MASTER }}\": {\"seeds\": [\"127.0.0.1:9300\"]}}}}}"
 
 # Add all the storage nodes to cross cluster searching.
-#{%- for SN, SNIP in salt['pillar.get']('nodestab', {}).iteritems() %}}
+
 {%- for SN, SNDATA in salt['pillar.get']('nodestab', {}).iteritems() %}
 curl -XPUT http://{{ ES }}:9200/_cluster/settings -H'Content-Type: application/json' -d '{"persistent": {"search": {"remote": {"{{ SN }}": {"skip_unavailable": "true", "seeds": ["{{ SNDATA.ip }}:9300"]}}}}}'
 {%- endfor %}