diff --git a/cloudcontrol/cli/commands/vm.py b/cloudcontrol/cli/commands/vm.py
index f7d2961d47fd54aa4caf93acd8ffe0caef4f6b6c..d9fdb2e3b6206327123912124c198a485cbca2ac 100644
--- a/cloudcontrol/cli/commands/vm.py
+++ b/cloudcontrol/cli/commands/vm.py
@@ -300,7 +300,7 @@ class Command_rescue(TqlCommand):
 
     def __init__(self, cli, argv0):
         TqlCommand.__init__(self, cli, argv0)
-        self.tql_filter += "&r=vm&status=stopped&rescue=no"
+        self.tql_filter += "&r=vm&status=stopped&mode=normal"
 
     def __call__(self, argv):
         # arg parse
@@ -318,7 +318,7 @@ class Command_unrescue(TqlCommand):
 
     def __init__(self, cli, argv0):
         TqlCommand.__init__(self, cli, argv0)
-        self.tql_filter += "&r=vm&status=stopped&rescue=yes"
+        self.tql_filter += "&r=vm&status=stopped&mode=rescue"
 
     def __call__(self, argv):
         # arg parse