diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index df875cb73..f432abbae 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -2715,7 +2715,7 @@ FW_devState($$@)
       } else {
         $room =~ s/,.*//;
       }
-      $link .= "&room=$room";
+      $link .= "&room=".urlEncode($room);
     }
     $txt = "<a href=\"$FW_ME$FW_subdir?$link$rf$FW_CSRF\">$txt</a>"
        if($link !~ m/ noFhemwebLink\b/);
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index ffe19622f..58d7a5d48 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -1099,7 +1099,7 @@ devspec2array($;$)
     my @res;
     foreach my $dName (split(":FILTER=", $l)) {
       my ($n,$op,$re) = ("NAME","=",$dName);
-      if($dName =~ m/^([^!<>]*)(=|!=|<=|>=|<|>)(.*)$/) {
+      if($dName =~ m/^(.*?)(=|!=|<=|>=|<|>)(.*)$/) {
         ($n,$op,$re) = ($1,$2,$3);
         $isAttr = 1;    # Compatibility: return "" instead of $name
       }