diff --git a/api/chalicelib/core/autocomplete.py b/api/chalicelib/core/autocomplete.py
index 06741cbe5..56ad29b54 100644
--- a/api/chalicelib/core/autocomplete.py
+++ b/api/chalicelib/core/autocomplete.py
@@ -8,16 +8,16 @@ TABLE = "public.autocomplete"
 
 
 def __get_autocomplete_table(value, project_id):
-    autocomplete_events = [schemas.FilterType.rev_id,
-                           schemas.EventType.click,
-                           schemas.FilterType.user_device,
-                           schemas.FilterType.user_id,
-                           schemas.FilterType.user_browser,
-                           schemas.FilterType.user_os,
-                           schemas.EventType.custom,
-                           schemas.FilterType.user_country,
-                           schemas.EventType.location,
-                           schemas.EventType.input]
+    autocomplete_events = [schemas.FilterType.rev_id.value.upper(),
+                           schemas.EventType.click.value.upper(),
+                           schemas.FilterType.user_device.value.upper(),
+                           schemas.FilterType.user_id.value.upper(),
+                           schemas.FilterType.user_browser.value.upper(),
+                           schemas.FilterType.user_os.value.upper(),
+                           schemas.EventType.custom.value.upper(),
+                           schemas.FilterType.user_country.value.upper(),
+                           schemas.EventType.location.value.upper(),
+                           schemas.EventType.input.value.upper()]
     autocomplete_events.sort()
     sub_queries = []
     c_list = []
diff --git a/ee/api/chalicelib/core/autocomplete_exp.py b/ee/api/chalicelib/core/autocomplete_exp.py
index 2e1a3f002..ea70af00e 100644
--- a/ee/api/chalicelib/core/autocomplete_exp.py
+++ b/ee/api/chalicelib/core/autocomplete_exp.py
@@ -8,16 +8,16 @@ TABLE = "experimental.autocomplete"
 
 
 def __get_autocomplete_table(value, project_id):
-    autocomplete_events = [schemas.FilterType.rev_id,
-                           schemas.EventType.click,
-                           schemas.FilterType.user_device,
-                           schemas.FilterType.user_id,
-                           schemas.FilterType.user_browser,
-                           schemas.FilterType.user_os,
-                           schemas.EventType.custom,
-                           schemas.FilterType.user_country,
-                           schemas.EventType.location,
-                           schemas.EventType.input]
+    autocomplete_events = [schemas.FilterType.rev_id.value.upper(),
+                           schemas.EventType.click.value.upper(),
+                           schemas.FilterType.user_device.value.upper(),
+                           schemas.FilterType.user_id.value.upper(),
+                           schemas.FilterType.user_browser.value.upper(),
+                           schemas.FilterType.user_os.value.upper(),
+                           schemas.EventType.custom.value.upper(),
+                           schemas.FilterType.user_country.value.upper(),
+                           schemas.EventType.location.value.upper(),
+                           schemas.EventType.input.value.upper()]
     autocomplete_events.sort()
     sub_queries = []
     c_list = []