diff --git a/aprsd/plugins/query.py b/aprsd/plugins/query.py
index e5a4bfc..dfb0f35 100644
--- a/aprsd/plugins/query.py
+++ b/aprsd/plugins/query.py
@@ -22,7 +22,7 @@ class QueryPlugin(plugin.APRSDPluginBase):
         searchstring = "^" + self.config["ham"]["callsign"] + ".*"
         # only I can do admin commands
         if re.search(searchstring, fromcall):
-            r = re.search(r"^\?-\*", message)
+            r = re.search(r"^\?[rR].*", message)
             if r is not None:
                 if len(tracker) > 0:
                     reply = "Resend ALL Delayed msgs"
@@ -33,7 +33,7 @@ class QueryPlugin(plugin.APRSDPluginBase):
                     LOG.debug(reply)
                 return reply
 
-            r = re.search(r"^\?-[fF]!", message)
+            r = re.search(r"^\?[fF].*", message)
             if r is not None:
                 reply = "Deleting ALL Delayed msgs."
                 LOG.debug(reply)