diff --git a/fhem/FHEM/30_HUEBridge.pm b/fhem/FHEM/30_HUEBridge.pm
index 49f556e75..b64ac1892 100644
--- a/fhem/FHEM/30_HUEBridge.pm
+++ b/fhem/FHEM/30_HUEBridge.pm
@@ -165,8 +165,8 @@ HUEBridge_Set($@)
     $hash->{STATE} = "updating";
     return "starting update";
   } else {
-    my $list = "statusRequest";
-    $list .= " swupdate" if( defined($hash->{updatestate}) && $hash->{updatestate} == 2 );
+    my $list = "statusRequest:noArg";
+    $list .= " swupdate:noArg" if( defined($hash->{updatestate}) && $hash->{updatestate} == 2 );
     return "Unknown argument $cmd, choose one of $list";
   }
 }
diff --git a/fhem/FHEM/31_HUEDevice.pm b/fhem/FHEM/31_HUEDevice.pm
index d260a0bf3..1758e26f3 100644
--- a/fhem/FHEM/31_HUEDevice.pm
+++ b/fhem/FHEM/31_HUEDevice.pm
@@ -318,7 +318,7 @@ HUEDevice_Set($@)
     return undef;
   }
 
-  my $list = "off on toggle statusRequest";
+  my $list = "off:noArg on:noArg toggle:noArg statusRequest:noArg";
   $list .= " pct:slider,0,1,100 bri:slider,0,1,254" if( AttrVal($name, "subType", "colordimmer") =~ m/dimmer/ );
   #$list .= " dim06% dim12% dim18% dim25% dim31% dim37% dim43% dim50% dim56% dim62% dim68% dim75% dim81% dim87% dim93% dim100%" if( AttrVal($hash->{NAME}, "subType", "colordimmer") =~ m/dimmer/ );
   $list .= " rgb:colorpicker,RGB color:slider,2000,1,6500 ct:slider,154,1,500 hue:slider,0,1,65535 sat:slider,0,1,254 xy effect:none,colorloop" if( AttrVal($hash->{NAME}, "subType", "colordimmer") =~ m/color/ );
diff --git a/fhem/FHEM/32_speedtest.pm b/fhem/FHEM/32_speedtest.pm
index 84bbacff0..490f2f287 100755
--- a/fhem/FHEM/32_speedtest.pm
+++ b/fhem/FHEM/32_speedtest.pm
@@ -80,7 +80,7 @@ speedtest_Set($$@)
     return undef;
   }
 
-  my $list = "statusRequest";
+  my $list = "statusRequest:noArg";
   return "Unknown argument $cmd, choose one of $list";
 }
 
diff --git a/fhem/FHEM/34_SWAP.pm b/fhem/FHEM/34_SWAP.pm
index 063b98ca4..32aa853d0 100755
--- a/fhem/FHEM/34_SWAP.pm
+++ b/fhem/FHEM/34_SWAP.pm
@@ -305,9 +305,9 @@ SWAP_Set($@)
   my $ll = GetLogLevel($name,3);
 
   my $list = "regGet regSet";
-  $list .= " statusRequest";
-  $list .= " readDeviceXML";
-  $list .= " clearUnconfirmed";
+  $list .= " statusRequest:noArg";
+  $list .= " readDeviceXML:noArg";
+  $list .= " clearUnconfirmed:noArg";
 
   if( my $sl = $modules{$hash->{TYPE}}{SWAP_SetList} ) {
 
@@ -328,7 +328,12 @@ SWAP_Set($@)
       }
     }
 
-    $list .= " " . join(" ", sort keys %{$sl});
+    foreach my $cmd ( sort keys ( %{$sl} ) ) {
+      $list .= " ";
+      $list .= $cmd;
+      $list .= ":noArg" if( !$sl->{$cmd} );
+    }
+    #$list .= " " . join(" ", sort keys %{$sl});
   }
 
   if( $hash->{reg} ) {
diff --git a/fhem/FHEM/34_panStamp.pm b/fhem/FHEM/34_panStamp.pm
index fa19a35e8..cfb4f35b0 100755
--- a/fhem/FHEM/34_panStamp.pm
+++ b/fhem/FHEM/34_panStamp.pm
@@ -140,7 +140,7 @@ panStamp_Set($@)
   my $cmd = shift @a;
   my $arg = join("", @a);
 
-  my $list = "discover raw";
+  my $list = "discover raw:noArg";
   return $list if( $cmd eq '?' );
 
   if($cmd eq "raw") {