diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml
index 02a7e0576..1d279491f 100644
--- a/salt/grafana/defaults.yaml
+++ b/salt/grafana/defaults.yaml
@@ -459,10 +459,10 @@ grafana:
             w: 24
 
 
-    mastersearch:
+    managersearch:
       templating:
         list:
-          - servername_mastersearch
+          - servername_managersearch
           - containers
           - manint
           - monint
diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls
index 118290e58..4cbb5c9ac 100644
--- a/salt/grafana/init.sls
+++ b/salt/grafana/init.sls
@@ -14,7 +14,7 @@
   {% set nodeTypes = ['eval'] %}
 {% else %}
   {#% set nodeTypes = ['standalone', 'manager', 'managersearch', 'sensortab', 'searchnode'] %#}
-  {% set nodeTypes = ['standalone', 'sensor', 'searchnode', 'heavynode'] %}
+  {% set nodeTypes = ['standalone', 'sensor', 'searchnode', , 'managersearch', 'heavynode'] %}
 {% endif %}
 
 {% if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone'] or (grains.role == 'so-eval' and GRAFANA == 1) %}
diff --git a/salt/grafana/templates/servername_mastersearch.json b/salt/grafana/templates/servername_managersearch.json
similarity index 92%
rename from salt/grafana/templates/servername_mastersearch.json
rename to salt/grafana/templates/servername_managersearch.json
index 2d1486038..6024c69f5 100644
--- a/salt/grafana/templates/servername_mastersearch.json
+++ b/salt/grafana/templates/servername_managersearch.json
@@ -2,7 +2,7 @@
     "allValue": null,
     "current": {},
     "datasource": "InfluxDB",
-    "definition": "show tag values with key=\"host\" where \"role\" = 'heavynode'",
+    "definition": "show tag values with key=\"host\" where \"role\" = 'managersearch'",
     "description": "",
     "error": null,
     "hide": 0,
@@ -11,7 +11,7 @@
     "multi": false,
     "name": "servername",
     "options": [],
-    "query": "show tag values with key=\"host\" where \"role\" = 'heavynode'",
+    "query": "show tag values with key=\"host\" where \"role\" = 'managersearch'",
     "refresh": 1,
     "regex": "",
     "skipUrlSync": false,