diff --git a/httpdocs/templates/pages/alerts/alert-stats.template b/httpdocs/templates/pages/alerts/alert-stats.template
index 2774e9f497..6c9abd6ced 100644
--- a/httpdocs/templates/pages/alerts/alert-stats.template
+++ b/httpdocs/templates/pages/alerts/alert-stats.template
@@ -185,7 +185,12 @@
             // add the tag filters inside the search params object
             for (const tag of tags) {
                 const tagData = tagify.tagData(tag);
-                const {key, selectedOperator, realValue, value} = tagData;
+
+                const key = tagData.key;
+                const selectedOperator = tagData.selectedOperator;
+                const realValue = tagData.realValue;
+                const value = tagData.value;
+
                 searchParams.set(key, `${realValue || value},${selectedOperator}`);
             }
 
@@ -234,7 +239,9 @@
                 tag.operators = DEFINED_TAGS[tag.key].operators;
             }
 
-            tag.selectedOperator = 'eq';
+            if (!tag.selectedOperator) {
+                tag.selectedOperator = 'eq';
+            }
 
             // add filter!
             tagify.addTags([tag]);
@@ -364,8 +371,9 @@
             }
 
             const tag = detail.data;
+
             // add/update datasource params, default operator `=`
-            datasourceParams[tag.key] = `${tag.realValue || tag.value},eq`;
+            datasourceParams[tag.key] = `${tag.realValue || tag.value},${tag.selectedOperator || 'eq'}`;
             // trigger request
             await onRangePickerChange(true);
         });
@@ -687,30 +695,25 @@
         }
 
         const filterModalMakeTag = (formSelector) => {
+           const alert_filter_type = $(`${formSelector} [name='alert_filter_type']`).val();
 
+           let tag = {
+               key: alert_filter_type,             // e.g. l7_proto 
+               label: i18n.tags[alert_filter_type] // e.g. L7 Proto
+           }
+
+           // load filter params inside the template container
            const $inputsTemplate = $(`${formSelector} .alert-filter-template-container [name]`);
-
-           const params = {
-               alert_filter_type: $(`${formSelector} [name='alert_filter_type']`).val()
-           };
-
-           // load each filter params inside the template container in params
            $inputsTemplate.each(function (i, input) {
-               // $(this).attr('name')
-               params['value'] = $(this).val().trim();
-               params['label'] = $('option:selected', this).data('tagLabel');
-               if (!params['label']) params['label'] = params['value'];
+               if ($(this).attr('name') == 'operator') {
+                   tag.selectedOperator = $(this).val().trim();
+               } else {
+                   tag.realValue = $(this).val().trim();
+                   tag.value = $('option:selected', this).data('tagLabel');
+                   if (!tag.value) tag.value = tag.realValue;
+               }
            });
 
-           // console.log(params);
-
-           const tag = { 
-              label: i18n.tags[params['alert_filter_type']], // e.g. L7 Proto
-              key: params['alert_filter_type'],              // e.g. l7_proto
-              value: params['label'],                        // e.g. HTTP
-              realValue: params['value']                     // e.g. 7
-           };
-
            return tag;
        }
 
diff --git a/httpdocs/templates/pages/modals/alerts/filters/add.template b/httpdocs/templates/pages/modals/alerts/filters/add.template
index 1eae79f71b..cc78ccf1a8 100644
--- a/httpdocs/templates/pages/modals/alerts/filters/add.template
+++ b/httpdocs/templates/pages/modals/alerts/filters/add.template
@@ -72,17 +72,28 @@
     <div class="form-group row">
         <label class="col-form-label col-sm-3"><b>{{i18n("level")}}</b></label>
         <div class="col-sm-5">
-            <select required name="value" class="form-select">
-               {% local first_item = true %}
-               {% for _, severity in pairsByValues(severities, alert_utils.severity_rev) do %}
-                  {% if severity.used_by_alerts then %}
-                     <option {{ (first_item and "selected" or "") }} data-tag-label="{{ i18n(severity.i18n_title) }}" value="{{ severity.severity_id }}">
-                        {{ i18n(severity.i18n_title) }}
-                     </option>
-                     {% first_item = false %}
-                  {% end %}
-               {% end %}
-            </select>
+            <div class="input-group mb-3">
+                <div class="input-group-prepend">
+                    <select required name="operator" class="form-select">
+                        {% local first_item = true %}
+                        {% for _, operator in ipairs(severity_operators) do %}
+                            <option {{ (first_item and "selected" or "") }} value="{{operator}}">{{tag_operators[operator]}}</option>
+                            {% first_item = false %}
+                        {% end %}
+                    </select>
+                </div>
+                <select required name="value" class="form-select">
+                   {% local first_item = true %}
+                   {% for _, severity in pairsByValues(severities, alert_utils.severity_rev) do %}
+                      {% if severity.used_by_alerts then %}
+                         <option {{ (first_item and "selected" or "") }} data-tag-label="{{ i18n(severity.i18n_title) }}" value="{{ severity.severity_id }}">
+                            {{ i18n(severity.i18n_title) }}
+                         </option>
+                         {% first_item = false %}
+                      {% end %}
+                   {% end %}
+                </select>
+            </div>
         </div>
     </div>
 </template>
diff --git a/scripts/lua/alert_stats.lua b/scripts/lua/alert_stats.lua
index aafb1c8251..23e7102b68 100644
--- a/scripts/lua/alert_stats.lua
+++ b/scripts/lua/alert_stats.lua
@@ -348,7 +348,10 @@ local extra_range_buttons = [[
 local available_filter_types = {}
 local all_alert_types = {}
 local extra_tags_buttons = ""
+local severity_operators = {}
 if page ~= "all" then
+   severity_operators = defined_tags[page].severity
+
    extra_tags_buttons = [[
     <button class="btn btn-link" aria-controls="]]..page..[[-alerts-table" type="button" id="btn-add-alert-filter" onclick="alertStats.filterModalShow()"><span><i class="fas fa-plus" data-original-title="" title="]]..i18n("alerts_dashboard.add_filter")..[["></i></span>
     </button>
@@ -438,6 +441,8 @@ local context = {
        severities = alert_severities,
        alert_types = all_alert_types,
        l7_protocols = interface.getnDPIProtocols(),
+       severity_operators = severity_operators,
+       tag_operators = tag_utils.tag_operators,
     }
 }
 
diff --git a/scripts/lua/modules/tag_utils.lua b/scripts/lua/modules/tag_utils.lua
index eee306fc02..235da7c487 100644
--- a/scripts/lua/modules/tag_utils.lua
+++ b/scripts/lua/modules/tag_utils.lua
@@ -70,22 +70,24 @@ function tag_utils.add_tag_if_valid(tags, tag_key, operators, formatters)
       return
    end
 
-   local value
    local selected_operator = 'eq'
 
    local get_value = _GET[tag_key]
    local splitted = split(get_value, ',')
 
+   local realValue
    if #splitted == 2 then
-      value = splitted[1]
+      realValue = splitted[1]
       selected_operator = splitted[2]
    end
 
+   local value = realValue
    if formatters[tag_key] ~= nil then
       value = formatters[tag_key](value)
    end
 
    table.insert(tags, {
+      realValue = realValue,
       value = value,
       label = i18n("tags.".. tag_key),
       key = tag_key,