diff --git a/includes/alerts.inc.php b/includes/alerts.inc.php
index f57c102b36..85b897ee68 100644
--- a/includes/alerts.inc.php
+++ b/includes/alerts.inc.php
@@ -91,7 +91,7 @@ function GenSQL($rule) {
         }
         $i++;
     }
-    $sql = "SELECT * FROM ".implode(",",$tables)." WHERE (".$join."".str_replace("(","",$tables[0]).".device_id = ?) && (".str_replace(array("%","@","!~","~"),array("","%","NOT LIKE","LIKE"),$rule).")";
+    $sql = "SELECT * FROM ".implode(",",$tables)." WHERE (".$join."".str_replace("(","",$tables[0]).".device_id = ?) && (".str_replace(array("%","@","!~","~"),array("",".*","NOT REGEXP","REGEXP"),$rule).")";
     return $sql;
 }
 
diff --git a/includes/device-groups.inc.php b/includes/device-groups.inc.php
index 3e5cee8705..a1573ec03e 100644
--- a/includes/device-groups.inc.php
+++ b/includes/device-groups.inc.php
@@ -63,7 +63,7 @@ function GenGroupSQL($pattern, $search='') {
         $search .= ' &&';
     }
 
-    $sql = 'SELECT DISTINCT('.str_replace('(', '', $tables[0]).'.device_id) FROM '.implode(',', $tables).' WHERE '.$search.' ('.str_replace(array('%', '@', '!~', '~'), array('', '%', 'NOT LIKE', 'LIKE'), $pattern).')';
+    $sql = 'SELECT DISTINCT('.str_replace('(', '', $tables[0]).'.device_id) FROM '.implode(',', $tables).' WHERE '.$search.' ('.str_replace(array('%', '@', '!~', '~'), array('', '.*', 'NOT REGEXP', 'REGEXP'), $pattern).')';
     return $sql;
 
 }//end GenGroupSQL()