diff --git a/fhem/FHEM/88_HMCCU.pm b/fhem/FHEM/88_HMCCU.pm
index f6b5260b5..9f7ba873f 100755
--- a/fhem/FHEM/88_HMCCU.pm
+++ b/fhem/FHEM/88_HMCCU.pm
@@ -4365,6 +4365,7 @@ sub HMCCU_GetEnumValues ($$$$;$$)
 			foreach my $cv (split(',', $argList)) {
 				$valList{$cv} = $i;
 				$valIndex{$i} = $cv;
+				$i++;
 			}
 		}
 	}
@@ -6725,7 +6726,7 @@ sub HMCCU_UpdateRoleCommands ($$)
 
 						# Build lookup table
 						my $argList = '';
-						my $el = HMCCU_GetEnumValues ($ioHash, $paramDef, undef, $role, '#', $pv);
+						my $el = HMCCU_GetEnumValues ($ioHash, $paramDef, $dpt, $role, '#', $pv);
 						if ($el ne '') {
 							my $min;
 							my $max;
diff --git a/fhem/FHEM/88_HMCCUCHN.pm b/fhem/FHEM/88_HMCCUCHN.pm
index b12910404..4229d5b7a 100644
--- a/fhem/FHEM/88_HMCCUCHN.pm
+++ b/fhem/FHEM/88_HMCCUCHN.pm
@@ -597,8 +597,7 @@ sub HMCCUCHN_Get ($@)
 	  	Turn device off.
 	  </li><br/>
 	  <li><b>set &lt;name&gt; oldLevel</b><br/>
-	    [dimmer, blind] Set level to previous value. The command is only available if channel
-		contains a datapoint LEVEL with a maximum value of 1.01.
+	    [dimmer, blind, jalousie, shutter] Set level to previous value.
 	  </li><br/>
 	  <li><b>set &lt;name&gt; on</b><br/>
 	  	Turn device on.
diff --git a/fhem/FHEM/HMCCUConf.pm b/fhem/FHEM/HMCCUConf.pm
index b5144385b..63c862c97 100644
--- a/fhem/FHEM/HMCCUConf.pm
+++ b/fhem/FHEM/HMCCUConf.pm
@@ -396,8 +396,9 @@ $HMCCU_CONFIG_VERSION = '5.0';
 		'close' => 'V:LEVEL:0',
 		'up' => 'V:LEVEL:?delta=+20',
 		'down' => 'V:LEVEL:?delta=-20',
-		'oldPos' => 'V:LEVEL:1.005',
-		'stop' => 'V:STOP:1'
+		'oldLevel' => 'V:LEVEL:1.005',
+		'stop' => 'V:STOP:1',
+		'toggle' => 'V:LEVEL:0,100'
 	},
 	'BLIND_VIRTUAL_RECEIVER' => {
 		'pct' => 'V:LEVEL:?level',
@@ -410,7 +411,8 @@ $HMCCU_CONFIG_VERSION = '5.0';
 		'pctSlats' => 'V:LEVEL_2:?level V:LEVEL:1.005',
 		'openSlats' => 'V:LEVEL_2:100 V:LEVEL:1.005',
 		'closeSlats' => 'V:LEVEL_2:0 V:LEVEL:1.005',
-		'allLevels' => 'V:LEVEL_2:?slatLevel V:LEVEL:?blindLevel'
+		'allLevels' => 'V:LEVEL_2:?slatLevel V:LEVEL:?blindLevel',
+		'toggle' => 'V:LEVEL:0,100'
 	},
 	'CLIMATECONTROL_REGULATOR' => {
 		'desired-temp' => 'V:SETPOINT:?temperature',
@@ -482,10 +484,12 @@ $HMCCU_CONFIG_VERSION = '5.0';
 		'up' => 'V:LEVEL:?delta=+20',
 		'down' => 'V:LEVEL:?delta=-20',
 		'stop' => 'V:STOP:1',
+		'oldLevel' => 'V:LEVEL:1.005',
 		'pctSlats' => 'V:LEVEL_SLATS:?level',
 		'openSlats' => 'V:LEVEL_SLATS:100',
 		'closeSlats' => 'V:LEVEL_SLATS:0',
-		'allLevels' => 'V:LEVEL_SLATS:?slatLevel V:LEVEL:?blindLevel'
+		'allLevels' => 'V:LEVEL_SLATS:?slatLevel V:LEVEL:?blindLevel',
+		'toggle' => 'V:LEVEL:0,100'
 	},
 	'KEY' => {
 		'on' => 'V:PRESS_SHORT:1',
@@ -529,7 +533,8 @@ $HMCCU_CONFIG_VERSION = '5.0';
 		'close' => 'V:LEVEL:0',
 		'up' => 'V:LEVEL:?delta=+20',
 		'down' => 'V:LEVEL:?delta=-20',
-		'stop' => 'V:STOP:1'
+		'stop' => 'V:STOP:1',
+		'toggle' => 'V:LEVEL:0,100'
 	},
 	'SMOKE_DETECTOR' => {
 		'command' => 'V:SMOKE_DETECTOR_COMMAND:#command'