diff --git a/frontend/app/components/shared/Filters/FilterSource/FilterSource.tsx b/frontend/app/components/shared/Filters/FilterSource/FilterSource.tsx
index 08c93d8df..7ae8d3a92 100644
--- a/frontend/app/components/shared/Filters/FilterSource/FilterSource.tsx
+++ b/frontend/app/components/shared/Filters/FilterSource/FilterSource.tsx
@@ -9,7 +9,7 @@ interface Props {
 }
 function FilterSource(props: Props) {
     const { filter } = props;
-    const [value, setValue] = useState(filter.source[0] || '');
+    const [value, setValue] = useState(filter.source && filter.source[0] ? filter.source[0] : '');
 
     useEffect(() => {
         setValue(filter.source[0] || '');
diff --git a/frontend/app/types/filter/newFilter.js b/frontend/app/types/filter/newFilter.js
index 7a612c193..286f1cc13 100644
--- a/frontend/app/types/filter/newFilter.js
+++ b/frontend/app/types/filter/newFilter.js
@@ -195,6 +195,7 @@ export default Record({
         _filter = filtersMap[type];
       }
     }
+
     return {
       ..._filter,
       ...filter,
diff --git a/frontend/app/utils/search.ts b/frontend/app/utils/search.ts
index 017a5a7f6..d688ee369 100644
--- a/frontend/app/utils/search.ts
+++ b/frontend/app/utils/search.ts
@@ -58,9 +58,6 @@ const getFiltersFromEntries = (entires: any) => {
 
       let filter: any = {};
       const filterKey = getFilterKeyTypeByKey(item.key);
-      if (!filterKey) {
-        return;
-      }
       const tmp = item.value.split('^');
       const valueArr = tmp[0].split('|');
       const operator = valueArr.shift();
@@ -78,10 +75,20 @@ const getFiltersFromEntries = (entires: any) => {
         }
       }
 
+      if (!filter) {
+        return
+      }
+
       filter.value = valueArr;
       filter.operator = operator;
-      filter.source = sourceArr && sourceArr.length > 0 ? sourceArr : null;
-      filter.sourceOperator = !!sourceOperator ? decodeURI(sourceOperator) : null;
+      if (filter.icon === "filters/metadata") {
+        filter.source = filter.type;
+        filter.type = 'metadata';
+      } else {
+        filter.source = sourceArr && sourceArr.length > 0 ? sourceArr : null;
+        filter.sourceOperator = !!sourceOperator ? decodeURI(sourceOperator) : null;
+      }
+      
       if (!filter.filters || filter.filters.size === 0) {
         filters.push(filter);
       }