diff --git a/package.json b/package.json
index 6b93bddd..81976934 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.4.8-b",
+  "version": "0.4.8-d",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/views/default.handlebars b/views/default.handlebars
index d5bbd0ec..e2124cd6 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -3029,7 +3029,7 @@
                             for (var j in node.tags) {
                                 var tag = node.tags[j];
                                 var collapsed = CollapsedGroups['tag:' + tag];
-                                var r2 = r.replace('**xx**xx*TaG*xx**xx**', tag + (collapsed?' style=display:none':''));
+                                var r2 = r.replace('**xx**xx*TaG*xx**xx**', encodeURIComponent(tag) + (collapsed?' style=display:none':''));
                                 if (groups[tag] == null) { groups[tag] = r2; groupCount[tag] = 1; } else { groups[tag] += r2; groupCount[tag] += 1; }
                                 if (view == 3) break;
                             }