diff --git a/api/chalicelib/core/autocomplete/autocomplete.py b/api/chalicelib/core/autocomplete/autocomplete.py
index f80059f37..aa40ccbd0 100644
--- a/api/chalicelib/core/autocomplete/autocomplete.py
+++ b/api/chalicelib/core/autocomplete/autocomplete.py
@@ -124,7 +124,7 @@ def __generic_autocomplete(event: Event):
     return f
 
 
-def __generic_autocomplete_metas(typename):
+def generic_autocomplete_metas(typename):
     def f(project_id, text):
         with pg_client.PostgresClient() as cur:
             params = {"project_id": project_id, "value": helper.string_to_sql_like(text),
diff --git a/api/chalicelib/core/sessions/sessions_metas.py b/api/chalicelib/core/sessions/sessions_metas.py
index f0aca0db1..1b538ec9c 100644
--- a/api/chalicelib/core/sessions/sessions_metas.py
+++ b/api/chalicelib/core/sessions/sessions_metas.py
@@ -4,64 +4,64 @@ from chalicelib.utils.event_filter_definition import SupportedFilter
 
 SUPPORTED_TYPES = {
     schemas.FilterType.USER_OS: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_OS),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_OS)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_OS),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_OS)),
     schemas.FilterType.USER_BROWSER: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_BROWSER),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_BROWSER)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_BROWSER),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_BROWSER)),
     schemas.FilterType.USER_DEVICE: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_DEVICE),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_DEVICE)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_DEVICE),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_DEVICE)),
     schemas.FilterType.USER_COUNTRY: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_COUNTRY),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_COUNTRY)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_COUNTRY),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_COUNTRY)),
     schemas.FilterType.USER_CITY: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_CITY),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_CITY)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_CITY),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_CITY)),
     schemas.FilterType.USER_STATE: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_STATE),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_STATE)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_STATE),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_STATE)),
     schemas.FilterType.USER_ID: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_ID),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_ID)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_ID),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_ID)),
     schemas.FilterType.USER_ANONYMOUS_ID: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_ANONYMOUS_ID),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_ANONYMOUS_ID)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_ANONYMOUS_ID),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_ANONYMOUS_ID)),
     schemas.FilterType.REV_ID: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.REV_ID),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.REV_ID)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.REV_ID),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.REV_ID)),
     schemas.FilterType.REFERRER: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.REFERRER),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.REFERRER)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.REFERRER),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.REFERRER)),
     schemas.FilterType.UTM_CAMPAIGN: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.UTM_CAMPAIGN),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.UTM_CAMPAIGN)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.UTM_CAMPAIGN),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.UTM_CAMPAIGN)),
     schemas.FilterType.UTM_MEDIUM: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.UTM_MEDIUM),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.UTM_MEDIUM)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.UTM_MEDIUM),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.UTM_MEDIUM)),
     schemas.FilterType.UTM_SOURCE: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.UTM_SOURCE),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.UTM_SOURCE)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.UTM_SOURCE),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.UTM_SOURCE)),
     # Mobile
     schemas.FilterType.USER_OS_MOBILE: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_OS_MOBILE),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_OS_MOBILE)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_OS_MOBILE),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_OS_MOBILE)),
     schemas.FilterType.USER_DEVICE_MOBILE: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(
+        get=autocomplete.generic_autocomplete_metas(
             typename=schemas.FilterType.USER_DEVICE_MOBILE),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_DEVICE_MOBILE)),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_DEVICE_MOBILE)),
     schemas.FilterType.USER_COUNTRY_MOBILE: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_COUNTRY_MOBILE),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_COUNTRY_MOBILE)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_COUNTRY_MOBILE),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_COUNTRY_MOBILE)),
     schemas.FilterType.USER_ID_MOBILE: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_ID_MOBILE),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_ID_MOBILE)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_ID_MOBILE),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_ID_MOBILE)),
     schemas.FilterType.USER_ANONYMOUS_ID_MOBILE: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_ANONYMOUS_ID_MOBILE),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.USER_ANONYMOUS_ID_MOBILE)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_ANONYMOUS_ID_MOBILE),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.USER_ANONYMOUS_ID_MOBILE)),
     schemas.FilterType.REV_ID_MOBILE: SupportedFilter(
-        get=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.REV_ID_MOBILE),
-        query=autocomplete.__generic_autocomplete_metas(typename=schemas.FilterType.REV_ID_MOBILE)),
+        get=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.REV_ID_MOBILE),
+        query=autocomplete.generic_autocomplete_metas(typename=schemas.FilterType.REV_ID_MOBILE)),
 
 }
 
diff --git a/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py b/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py
index a779ec602..2eed9d5bf 100644
--- a/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py
+++ b/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py
@@ -125,7 +125,7 @@ def __generic_autocomplete(event: Event):
     return f
 
 
-def __generic_autocomplete_metas(typename):
+def generic_autocomplete_metas(typename):
     def f(project_id, text):
         with ch_client.ClickHouseClient() as cur:
             params = {"project_id": project_id, "value": helper.string_to_sql_like(text),