diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index c87c596f0..266ff0880 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -2722,13 +2722,9 @@ FW_dropdownFn()
     my $fpname = $FW_wname;
     $fpname =~ s/.*floorplan\/(\w+)$/$1/;  #allow usage of attr fp_setbutton
     my $fwsel;
-    if(AttrVal($fpname,'fp_setbutton',1)) {
-      $fwsel = FW_select("$d-$cmd","val.$d", \@tv, $txt, "dropdown").
-               FW_submit("cmd.$d", "set");
-    } else {
-      $fwsel = FW_select("$d-$cmd","val.$d", \@tv, $txt,"dropdown","submit()").
-               FW_hidden("cmd.$d", "set");
-    }
+    $fwsel = ($cmd eq "state" ? "" : "$cmd ") .
+             FW_select("$d-$cmd","val.$d", \@tv, $txt,"dropdown","submit()").
+             FW_hidden("cmd.$d", "set");
 
     return "<td colspan='2'><form method=\"$FW_formmethod\">".
       FW_hidden("arg.$d", $cmd) .
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index 150645105..7ebd0d81b 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -2878,7 +2878,8 @@ ReplaceEventMap($$$)
   my $changed;
   my @emList = EventMapAsList($em);
   foreach my $rv (@emList) {
-    my ($re, $val) = split(":", $rv, 2); # Real-Event-Regexp:GivenName
+    # Real-Event-Regexp:GivenName[:modifier]
+    my ($re, $val, $modifier) = split(":", $rv, 3);
     next if(!defined($val));
     if($dir) {  # event -> GivenName
       if($str =~ m/$re/) {