diff --git a/scripts/locales/en.lua b/scripts/locales/en.lua
index 8047df0867ab..193581689da9 100644
--- a/scripts/locales/en.lua
+++ b/scripts/locales/en.lua
@@ -2274,7 +2274,7 @@ local lang = {
       ["traffic_direction"] = "Traffic Direction",
       ["user_agent"] = "User Agent",
       ["vlan_id"] = "VLAN",
-      ["wlan_ssid"] = "SSID",
+      ["wlan_ssid"] = "WLAN SSID",
       ["minor_connection_states"] = {
         ["0"] = "NO_STATE",
         ["1"] = "S0 - Connection attempt seen, no reply",
diff --git a/scripts/lua/modules/http_lint.lua b/scripts/lua/modules/http_lint.lua
index 37b2aa970267..be39f35284c3 100644
--- a/scripts/lua/modules/http_lint.lua
+++ b/scripts/lua/modules/http_lint.lua
@@ -1699,6 +1699,7 @@ local known_parameters = {
    ["mac"] = validateEmptyOr(validateListOfTypeInline(validateFilters(validateMac))), -- a MAC address
    ["cli_mac"] = validateEmptyOr(validateListOfTypeInline(validateFilters(validateMac))), -- a MAC address
    ["srv_mac"] = validateEmptyOr(validateListOfTypeInline(validateFilters(validateMac))), -- a MAC address
+   ["apn_mac"] = validateEmptyOr(validateListOfTypeInline(validateFilters(validateMac))), -- a MAC address
    ["tskey"] = validateUnquoted, -- timeseries name
    ["peer1"] = validateHost, -- a Peer in a connection
    ["peer2"] = validateHost, -- another Peer in a connection
@@ -1719,6 +1720,7 @@ local known_parameters = {
    ["name"] = validateEmptyOr(validateListOfTypeInline(validateFilters(validateServer))), -- An IPv4 or IPv6 address or an Hostname
    ["cli_name"] = validateEmptyOr(validateListOfTypeInline(validateFilters(validateHostName))), -- An IPv4 or IPv6 address or an Hostname
    ["srv_name"] = validateEmptyOr(validateListOfTypeInline(validateFilters(validateHostName))), -- An IPv4 or IPv6 address or an Hostname
+   ["wlan_ssid"] = validateEmptyOr(validateListOfTypeInline(validateFilters(validateUnquoted))),
    ["cli_port"] = validateListOfTypeInline(validateFilters(validatePort)), -- Client port
    ["srv_port"] = validateListOfTypeInline(validateFilters(validatePort)), -- Server port
    ["cli_asn"] = validateListOfTypeInline(validateFilters(validateASN)),
diff --git a/scripts/lua/modules/tag_utils.lua b/scripts/lua/modules/tag_utils.lua
index 2cd25de5717a..d7aa357b5dac 100644
--- a/scripts/lua/modules/tag_utils.lua
+++ b/scripts/lua/modules/tag_utils.lua
@@ -616,12 +616,12 @@ tag_utils.defined_tags = {
     },
     wlan_ssid = {
         value_type = 'text',
-        i18n_label = i18n('db_search.tags.apn_mac'),
+        i18n_label = i18n('db_search.tags.wlan_ssid'),
         operators = {'eq', 'neq', 'in', 'nin'}
     },
     apn_mac = {
         value_type = 'mac',
-        i18n_label = i18n('db_search.tags.wlan_ssid'),
+        i18n_label = i18n('db_search.tags.apn_mac'),
         operators = {'eq', 'neq'}
     },
 }