diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index d7407c3d8..4d3ac39c9 100644
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -1535,8 +1535,8 @@ FW_doDetail($)
                 sort map { $_ =~ s/ /#/g ;$_} keys %FW_rooms);
   my $groupList = "multiple,".join(",", 
                 sort map { $_ =~ s/ /#/g ;$_} keys %FW_groups);				
-  $attrList =~ s/room /room:$roomList /;
-  $attrList =~ s/group /group:$groupList /;
+  $attrList =~ s/\broom\b/room:$roomList/;
+  $attrList =~ s/\bgroup\b/group:$groupList/;
   $attrList = FW_widgetOverride($d, $attrList);
   $attrList =~ s/\\/\\\\/g;
   $attrList =~ s/'/\\'/g;
diff --git a/fhem/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js
index c9f1abc0b..afc3194aa 100644
--- a/fhem/www/pgm2/fhemweb.js
+++ b/fhem/www/pgm2/fhemweb.js
@@ -307,12 +307,15 @@ FW_jqueryReadyFn()
       $("#content")
         .append("<div id='workbench' style='display:none'></div>");
       $("#content > #workbench").html(data);
-
       var mtype = $("#content > #workbench a[name]").attr("name"), aTag;
-      if(mtype)
-        aTag = $("#content > #workbench").find("a[name="+mtype+val+"]");
-      if(!$(aTag).length) // old style syntax without type
-        aTag = $("#content > #workbench").find("a[name="+val+"]");
+      if(mtype) {
+        var mv = (mtype+val).replaceAll(/[^a-z0-9_]/ig,'_')
+        aTag = $("#content > #workbench").find("a[name="+mv+"]");
+      }
+      if(!$(aTag).length) { // old style syntax without type
+        var v = (val).replaceAll(/[^a-z0-9_]/ig,'_')
+        aTag = $("#content > #workbench").find("a[name="+v+"]");
+      }
       if($(aTag).length) {
         var liTag = $(aTag).next("li");
         if(!$(liTag).length)