diff --git a/http_src/vue/modal-filters.vue b/http_src/vue/modal-filters.vue
index 01b8526adb..df7cc6cf79 100644
--- a/http_src/vue/modal-filters.vue
+++ b/http_src/vue/modal-filters.vue
@@ -1,72 +1,62 @@
 <!-- (C) 2022 - ntop.org     -->
 <template>
-<modal :id="id_modal" ref="modal">
-  <template v-slot:title>{{i18n('alerts_dashboard.add_filter')}}</template>
-  <template v-slot:body>
-    <form autocomplete="off">
-      <div class="form-group row">
-	<label class="col-form-label col-sm-3" for="dt-filter-type-select">
-	  <b>Filter</b>
-	</label>
-	<div class="col-sm-8">
-    <select-search v-model:selected_option="filter_type_selected"
-      :id="'filter_type'"
-      :options="filters_options"
-      @select_option="change_filter()">
-    </select-search>
-	</div>
-      </div>
-      <hr>
-      <div class="dt-filter-template-container form-group row">
-	<label class="col-form-label col-sm-3">
-          <b>{{filter_type_label_selected}}</b>
-	</label>
-	<div class="col-sm-8">
-          <div class="input-group mb-3">
-            <div class="input-group-prepend col-sm-3">
-              <select-search v-model:selected_option="operator_selected"
-                :id="'operator_filter'"
-                :options="operators_to_show"
-                @select_option="change_operator_type">
-              </select-search>
-            </div>
-            <div class="col-sm-9" v-if="input_type == 'select'">
-              <select-search v-model:selected_option="option_selected"
-                             :id="'data_filter'"
-                             :options="options_to_show"
-                             @select_option="change_data_filter">
-              </select-search>
-            </div>
-            <div class="col-sm-9" v-else-if="input_type == 'select-with-input'">
-              <select-search v-model:selected_option="option_selected"
-                             :id="'data_filter'"
-                             :add_tag="true"
-			     :pattern="data_pattern_selected"
-                             :options="options_to_show"
-                             @select_option="change_data_filter">
-              </select-search>
-            </div>
-            <template v-else>
-              <input v-model="input_value"
-                     v-if="operator_selected?.id != 'empty' && operator_selected?.id != 'nempty'"
-                     :pattern="data_pattern_selected"
-                     name="value"
-                     :required="input_required"
-                     type="text"
-                     class="form-control">
-              <span style="margin: 0px;padding:0;" class="alert invalid-feedback">{{i18n('invalid_value')}}</span>
-            </template>
-          </div>
-          <!-- end div input-group mb-3 -->
-	</div>
-	<!-- end div form-group-row -->
-      </div>
-    </form>
-  </template>
-  <template v-slot:footer>
-    <button type="button" :disabled="check_disable_apply()" @click="apply" class="btn btn-primary">{{i18n('apply')}}</button>
-  </template>
-</modal>
+    <modal :id="id_modal" ref="modal">
+        <template v-slot:title>{{ i18n('alerts_dashboard.add_filter') }}</template>
+        <template v-slot:body>
+            <form autocomplete="off">
+                <div class="form-group row">
+                    <label class="col-form-label col-sm-3" for="dt-filter-type-select">
+                        <b>Filter</b>
+                    </label>
+                    <div class="col-sm-8">
+                        <select-search v-model:selected_option="filter_type_selected" :id="'filter_type'"
+                            :options="filters_options" @select_option="change_filter()">
+                        </select-search>
+                    </div>
+                </div>
+                <hr>
+                <div class="dt-filter-template-container form-group row">
+                    <label class="col-form-label col-sm-3">
+                        <b>{{ filter_type_label_selected }}</b>
+                    </label>
+                    <div class="col-sm-8">
+                        <div class="input-group mb-3">
+                            <div class="input-group-prepend col-sm-3">
+                                <select-search v-model:selected_option="operator_selected" :id="'operator_filter'"
+                                    :options="operators_to_show" @select_option="change_operator_type">
+                                </select-search>
+                            </div>
+                            <div class="col-sm-9" v-if="input_type == 'select'">
+                                <select-search v-model:selected_option="option_selected" :id="'data_filter'"
+                                    :options="options_to_show" @select_option="change_data_filter">
+                                </select-search>
+                            </div>
+                            <div class="col-sm-9" v-else-if="input_type == 'select-with-input'">
+                                <select-search v-model:selected_option="option_selected" :id="'data_filter'"
+                                    :add_tag="true" :pattern="data_pattern_selected" :options="options_to_show"
+                                    @select_option="change_data_filter">
+                                </select-search>
+                            </div>
+                            <template v-else>
+                                <input v-model="input_value"
+                                    v-if="operator_selected?.id != 'empty' && operator_selected?.id != 'nempty'"
+                                    :pattern="data_pattern_selected" name="value" :required="input_required" type="text"
+                                    class="form-control">
+                                <span style="margin: 0px;padding:0;"
+                                    class="alert invalid-feedback">{{ i18n('invalid_value') }}</span>
+                            </template>
+                        </div>
+                        <!-- end div input-group mb-3 -->
+                    </div>
+                    <!-- end div form-group-row -->
+                </div>
+            </form>
+        </template>
+        <template v-slot:footer>
+            <button type="button" :disabled="check_disable_apply()" @click="apply"
+                class="btn btn-primary">{{ i18n('apply') }}</button>
+        </template>
+    </modal>
 </template>
 
 <script type="text/javascript">
@@ -76,189 +66,193 @@ import regexValidation from "../utilities/regex-validation.js";
 
 export default {
     components: {
-	'modal': Modal,
-	'select-search': SelectSearch,
-    }, 
+        'modal': Modal,
+        'select-search': SelectSearch,
+    },
     props: {
-	id: String,
-	filters_options: Array,
+        id: String,
+        filters_options: Array,
     },
     updated() {
     },
     data() {
-	return {
-	    i18n: (t) => i18n(t),
-	    jQuery: $,
-	    id_modal: `${this.$props.id}_modal`,
-	    filter_type_selected: {},
-	    filter_type_label_selected: null,
-	    operator_selected: {},
-	    option_selected: {},
-	    input_value: null,
-	    input_type: null,
-	    data_pattern_selected: null,
-	    input_required: false,
-	    options_to_show: null,
-	    operators_to_show: [],
-	};
+        return {
+            i18n: (t) => i18n(t),
+            jQuery: $,
+            id_modal: `${this.$props.id}_modal`,
+            filter_type_selected: {},
+            filter_type_label_selected: null,
+            operator_selected: {},
+            option_selected: {},
+            input_value: null,
+            input_type: null,
+            data_pattern_selected: null,
+            input_required: false,
+            options_to_show: null,
+            operators_to_show: [],
+        };
     },
     emits: ["apply"],
-    created() {},
+    created() { },
     /** This method is the first method called after html template creation. */
     async mounted() {
-	await ntopng_sync.on_ready(this.id_modal);
-	ntopng_events_manager.on_custom_event(this.$props["id"], ntopng_custom_events.SHOW_MODAL_FILTERS, (filter) => this.show(filter));	
-	// notifies that component is ready
-	ntopng_sync.ready(this.$props["id"]);
+        await ntopng_sync.on_ready(this.id_modal);
+        ntopng_events_manager.on_custom_event(this.$props["id"], ntopng_custom_events.SHOW_MODAL_FILTERS, (filter) => this.show(filter));
+        // notifies that component is ready
+        ntopng_sync.ready(this.$props["id"]);
     },
     methods: {
-	show: function(filter) {
-	    if (this.$props.filters_options == null || this.$props.filters_options.length == 0) { 
-		return; 
-	    }
-	    if (filter != null) {
-	  	this.filter_type_selected = filter;
-		this.change_filter(filter);		
-	    } else {
-		this.filter_type_selected = this.$props.filters_options[0];
-		this.change_filter();
-	    }
-	    this.$refs["modal"].show();
-	},
-	post_change: function(filter, value_type) {
-	    if (filter.id && this.$props.filters_options) {
-		/* Filter type selected, e.g. Alert Type, Application, ecc. */
-		this.filter_type_selected = this.$props.filters_options.find((fo) => fo.id == filter.id);
-	    }
-	    if (filter.value != null) {
-		/* Filter selected for the type, e.g. DNS, ICMP, ecc. */
-		if (this.options_to_show) {
-		    this.option_selected = this.options_to_show.find((fo) => fo.value == filter.value);
-		} else {
-		    this.option_selected = {};
-		    this.input_value = filter.value;
-		    this.data_pattern_selected = this.get_data_pattern(value_type);
-		}
-	    }
-	    if (filter.operator && this.operators_to_show) {
-		/* Operator filter selected, e.g. =, !=, ecc. */
-		this.operator_selected = this.operators_to_show.find((fo) => fo.id == filter.operator);
-	    }
-	},
-	change_operator_type: function(selected_operator_type) {
-	    this.operator_selected = selected_operator_type
-	},
-	change_data_filter: function(selected_filter) {
-	    this.option_selected = selected_filter
-	},  
-	change_input_value: function(input) {
-	    this.input_value = input;
-	},
-	change_filter: function(selected_filter) {
-	    this.options_to_show = null;
-	    this.option_selected = null;
-	    this.input_value = null
-	    let filters_options = this.$props.filters_options;
-	    /* Search the filter selected */
-	    let filter = filters_options.find((fo) => fo.id == this.filter_type_selected.id);
-	    if (filter == null) { 
-		return; 
-	    }
-	    /* Set the correct filters to display */
-	    this.input_type = filter.type;
-	    this.operators_to_show = filter.operators;
-	    this.filter_type_label_selected = filter.label;
-	    if (this.input_type == 'select') {
-		this.options_to_show = filter.options.sort((a, b) => {
-		    if (a == null || a.label == null) { return -1; }
-		    if (b == null || b.label == null) { return 1; }
-		    return a.label.toString().localeCompare(b.label.toString());
-		});
-		this.option_selected = this.options_to_show[0];
-	    } else if (this.input_type == 'select-with-input') {
-		this.options_to_show = filter.options?.sort((a, b) => {
-		    if (a == null || a.label == null) { return -1; }
-		    if (b == null || b.label == null) { return 1; }
-		    return a.label.toString().localeCompare(b.label.toString());
-		});
-		this.option_selected = this.options_to_show[0];
-		this.data_pattern_selected = this.get_data_pattern(filter.value_type);
-	    } else {
-		this.options_to_show = null;
-		this.data_pattern_selected = this.get_data_pattern(filter.value_type);
-	    }
+        show: function (filter) {
+            if (this.$props.filters_options == null || this.$props.filters_options.length == 0) {
+                return;
+            }
+            if (filter != null) {
+                this.filter_type_selected = filter;
+                this.change_filter(filter);
+            } else {
+                this.filter_type_selected = this.$props.filters_options[0];
+                this.change_filter();
+            }
+            this.$refs["modal"].show();
+        },
+        post_change: function (filter, value_type) {
+            if (filter.id && this.$props.filters_options) {
+                /* Filter type selected, e.g. Alert Type, Application, ecc. */
+                this.filter_type_selected = this.$props.filters_options.find((fo) => fo.id == filter.id);
+            }
+            if (filter.value != null) {
+                /* Filter selected for the type, e.g. DNS, ICMP, ecc. */
+                if (this.options_to_show) {
+                    this.option_selected = this.options_to_show.find((fo) => fo.value == filter.value);
+                } else {
+                    this.option_selected = {};
+                    this.input_value = filter.value;
+                    this.data_pattern_selected = this.get_data_pattern(value_type);
+                }
+            }
+            if (filter.operator && this.operators_to_show) {
+                /* Operator filter selected, e.g. =, !=, ecc. */
+                this.operator_selected = this.operators_to_show.find((fo) => fo.id == filter.operator);
+            }
+        },
+        change_operator_type: function (selected_operator_type) {
+            this.operator_selected = selected_operator_type
+        },
+        change_data_filter: function (selected_filter) {
+            this.option_selected = selected_filter
+        },
+        change_input_value: function (input) {
+            this.input_value = input;
+        },
+        change_filter: function (selected_filter) {
+            this.options_to_show = null;
+            this.option_selected = null;
+            this.input_value = null
+            let filters_options = this.$props.filters_options;
+            /* Search the filter selected */
+            let filter = filters_options.find((fo) => fo.id == this.filter_type_selected.id);
+            if (filter == null) {
+                return;
+            }
+            /* Set the correct filters to display */
+            this.input_type = filter.type;
+            this.operators_to_show = filter.operators;
+            this.filter_type_label_selected = filter.label;
+            if (this.input_type == 'select') {
+                this.options_to_show = filter.options.sort((a, b) => {
+                    if (a == null || a.label == null) { return -1; }
+                    if (b == null || b.label == null) { return 1; }
+                    return a.label.toString().localeCompare(b.label.toString());
+                });
+                this.option_selected = this.options_to_show[0];
+            } else if (this.input_type == 'select-with-input') {
+                this.options_to_show = filter.options?.sort((a, b) => {
+                    if (a == null || a.label == null) { return -1; }
+                    if (b == null || b.label == null) { return 1; }
+                    return a.label.toString().localeCompare(b.label.toString());
+                });
+                this.option_selected = this.options_to_show[0];
+                this.data_pattern_selected = this.get_data_pattern(filter.value_type);
+            } else {
+                this.options_to_show = null;
+                this.data_pattern_selected = this.get_data_pattern(filter.value_type);
+            }
 
-	    if(filter.operators && this.operator_selected?.id == null) {
-		this.operator_selected = filter.operators[0]
-	    }
-	    
-	    if (selected_filter != null) { 
-		this.post_change(selected_filter, filter.value_type); 
-	    }
-	},
-	get_data_pattern: function(value_type) {
-	    this.input_required = true;
-	    if (value_type == "text") {
-		this.input_required = false;
-		return `.*`;
-	    }
-	    return regexValidation.get_data_pattern(value_type);
-	    
-	    // else if (value_type == "ip") {
-	    // 	let r_ipv4 = NtopUtils.REGEXES.ipv4;
-	    // 	let r_ipv4_vlan = r_ipv4.replace("$", "@[0-9]{0,5}$");
-	    // 	let r_ipv6 = NtopUtils.REGEXES.ipv6;
-	    // 	let r_ipv6_vlan = r_ipv6.replaceAll("$", "@[0-9]{0,5}$");
-	    // 	return `(${r_ipv4})|(${r_ipv4_vlan})|(${r_ipv6})|(${r_ipv6_vlan})`;
-	    // } else if (value_type == "cidr") {
-	    // 	console.log("test");
-	    // }
-	    
-	    // return NtopUtils.REGEXES[value_type];
-	},
-	check_disable_apply: function() {
-	    let regex = new RegExp(this.data_pattern_selected);
-	    let disable_apply = !this.options_to_show && (
-		(this.input_required && (this.input_value == null || this.input_value == ""))
-		    || (regex.test(this.input_value) == false)
-	    );
-	    return disable_apply;
-	},
-	apply: function() {
-	    let value = this.input_value;
-	    let value_label = this.input_value;
-	    if (value == null || (this.option_selected?.value != null)) {
-		let filter = this.filters_options.find((fo) => fo.id == this.filter_type_selected.id);
-		let option = filter.options.find((o) => o.value == this.option_selected.value);
+            if (filter.operators && this.operator_selected?.id == null) {
+                this.operator_selected = filter.operators[0]
+            }
+
+            if (selected_filter != null) {
+                this.post_change(selected_filter, filter.value_type);
+            }
+        },
+        get_data_pattern: function (value_type) {
+            this.input_required = true;
+            if (value_type == "text") {
+                this.input_required = false;
+                return `.*`;
+            }
+            return regexValidation.get_data_pattern(value_type);
+
+            // else if (value_type == "ip") {
+            // 	let r_ipv4 = NtopUtils.REGEXES.ipv4;
+            // 	let r_ipv4_vlan = r_ipv4.replace("$", "@[0-9]{0,5}$");
+            // 	let r_ipv6 = NtopUtils.REGEXES.ipv6;
+            // 	let r_ipv6_vlan = r_ipv6.replaceAll("$", "@[0-9]{0,5}$");
+            // 	return `(${r_ipv4})|(${r_ipv4_vlan})|(${r_ipv6})|(${r_ipv6_vlan})`;
+            // } else if (value_type == "cidr") {
+            // 	console.log("test");
+            // }
+
+            // return NtopUtils.REGEXES[value_type];
+        },
+        check_disable_apply: function () {
+            let regex = new RegExp(this.data_pattern_selected);
+            let disable_apply = !this.options_to_show && (
+                (this.input_required && (this.input_value == null || this.input_value == ""))
+                || (regex.test(this.input_value) == false)
+            );
+            return disable_apply;
+        },
+        apply: function () {
+            let value = this.input_value;
+            let value_label = this.input_value;
+            if (value == null || (this.option_selected?.value != null)) {
+                let filter = this.filters_options.find((fo) => fo.id == this.filter_type_selected.id);
+                let option = filter?.options?.find((o) => o.value == this.option_selected.value);
                 if (option == null) {
                     option = this.option_selected;
                 }
-		value = option.value;
-		value_label = option.value_label || option.label;
-	    }
-	    let params = {
-		id: this.filter_type_selected.id,
-		label: this.filter_type_label_selected,
-		operator: this.operator_selected.id,
-		value: value,
-		value_label: value_label,
-	    };
-	    this.$emit("apply", params);
-	    ntopng_events_manager.emit_custom_event(ntopng_custom_events.MODAL_FILTERS_APPLY, params);
-	    this.close();
-	},
-	close: function() {
-	    this.$refs["modal"].close();
-	},
+                value = option?.value;
+                value_label = option?.value_label || option?.label;
+                if (!value) {
+                    value = ""
+                }
+            }
+            let params = {
+                id: this.filter_type_selected.id,
+                label: this.filter_type_label_selected,
+                operator: this.operator_selected.id,
+                value: value,
+                value_label: value_label,
+            };
+            this.$emit("apply", params);
+            ntopng_events_manager.emit_custom_event(ntopng_custom_events.MODAL_FILTERS_APPLY, params);
+            this.close();
+        },
+        close: function () {
+            this.$refs["modal"].close();
+        },
     },
 }
 </script>
 
 <style scoped>
-input ~ .alert {
-  display: none;
+input~.alert {
+    display: none;
 }
-input:invalid ~ .alert {
-  display: block;
+
+input:invalid~.alert {
+    display: block;
 }
 </style>
diff --git a/http_src/vue/range-picker.vue b/http_src/vue/range-picker.vue
index 9f4f193607..c7a5d4f82a 100644
--- a/http_src/vue/range-picker.vue
+++ b/http_src/vue/range-picker.vue
@@ -144,12 +144,8 @@ const load_filters_data = async function () {
         let filter_def = FILTERS_CONST.find((fc) => fc.id == key);
         if (filter_def != null) {
             let options_string = value.split(",");
-            debugger;
             options_string.forEach((opt_string) => {
                 let [value, operator] = opt_string.split(";");
-                if (operator == null || value == null || operator == "") {
-                    return;
-                }
                 let value_label = value;
                 if (filter_def.value_type == "array") {
                     value_label = filter_def?.options?.find((opt) => opt.value == value)?.label;
@@ -233,18 +229,15 @@ export default {
             let filters_to_add = {}
             for (const key in filters_object) {
                 const value = filters_object[key]
-                const result = value.split(";"); /* Do not add the values like ;eq, it causes problems with linting */
-                if (!dataUtils.isEmptyOrNull(result[0])) {
-                    filters_to_add[key] = filters_object[key]
-                }
+                filters_to_add[key] = filters_object[key]
             }
             ntopng_url_manager.add_obj_to_url(filters_to_add);
             filters.forEach((f) => {
-                if (!dataUtils.isEmptyOrNull(f.value)) {
+                //if (!dataUtils.isEmptyOrNull(f.value)) {
                     let tag = create_tag_from_filter(f);
                     if (tag == null) { return; }
                     TAGIFY.addFilterTag(tag);
-                }
+                //}
             });
             this.last_filters = filters;
         },
diff --git a/httpdocs/dist b/httpdocs/dist
index aab4f23caf..0453bcc8c8 160000
--- a/httpdocs/dist
+++ b/httpdocs/dist
@@ -1 +1 @@
-Subproject commit aab4f23caf0a100818f55d43b3e6f8e17f4a61a5
+Subproject commit 0453bcc8c8bd145ca815107b91ae49bd66770bf7