diff --git a/html/includes/modal/new_alert_rule.inc.php b/html/includes/modal/new_alert_rule.inc.php
index 6c65581006..b1e4376b80 100644
--- a/html/includes/modal/new_alert_rule.inc.php
+++ b/html/includes/modal/new_alert_rule.inc.php
@@ -181,7 +181,11 @@ $('#and, #or').click('', function(e) {
            strategy: 'array',
            tagFieldName: 'rules[]'
         });
-        $('#response').data('tagmanager').populate([ '%'+entity+' '+condition+' "'+value+'" '+glue ]);
+        if(entity.indexOf("%") >= 0) {
+            $('#response').data('tagmanager').populate([ entity+' '+condition+' '+value+' '+glue ]);
+        } else {
+            $('#response').data('tagmanager').populate([ '%'+entity+' '+condition+' "'+value+'" '+glue ]);
+        }
     }
 });