diff --git a/frontend/app/components/shared/Filters/FilterAutoComplete/FilterAutoComplete.tsx b/frontend/app/components/shared/Filters/FilterAutoComplete/FilterAutoComplete.tsx
index 99e38736b..9777fd122 100644
--- a/frontend/app/components/shared/Filters/FilterAutoComplete/FilterAutoComplete.tsx
+++ b/frontend/app/components/shared/Filters/FilterAutoComplete/FilterAutoComplete.tsx
@@ -146,7 +146,9 @@ function FilterAutoComplete(props: Props) {
     const loadOptions = (inputValue: string, callback: (options: []) => void) => {
         // remove underscore from params
         const _params = Object.keys(params).reduce((acc: any, key: string) => {
-            acc[key] = params[key].replace(/^_/, '');
+            if (key === 'type' && params[key] === 'metadata') {
+                acc[key] = params[key].replace(/^_/, '');
+            }
             return acc;
         }, {});
 
diff --git a/frontend/app/types/filter/newFilter.js b/frontend/app/types/filter/newFilter.js
index 13544afdd..9745eca98 100644
--- a/frontend/app/types/filter/newFilter.js
+++ b/frontend/app/types/filter/newFilter.js
@@ -642,7 +642,8 @@ export const addElementToLiveFiltersMap = (
   icon = 'filters/metadata'
 ) => {
   liveFiltersMap[key] = {
-    key, type, category, label: capitalize(key),
+    key, type, category,
+    label: key.replace(/^_/, '').charAt(0).toUpperCase() + key.slice(2),
     operator: operator,
     operatorOptions,
     icon,