diff --git a/frontend/src/metadata/components/popover/filter-popover/basic-filters/index.js b/frontend/src/metadata/components/popover/filter-popover/basic-filters/index.js
index a8c2c47dc9..a0488a1257 100644
--- a/frontend/src/metadata/components/popover/filter-popover/basic-filters/index.js
+++ b/frontend/src/metadata/components/popover/filter-popover/basic-filters/index.js
@@ -49,7 +49,7 @@ const BasicFilters = ({ readOnly, filters = [], onChange, viewType }) => {
               );
             }
             if (column_key === PRIVATE_COLUMN_KEY.FILE_TYPE) {
-              const FileTypeFilter = viewType === VIEW_TYPE.GALLERY ? GalleryFileTypeFilter : TableFileTypeFilter;
+              const FileTypeFilter = [VIEW_TYPE.GALLERY, VIEW_TYPE.MAP].includes(viewType) ? GalleryFileTypeFilter : TableFileTypeFilter;
               return (<FileTypeFilter key={column_key} readOnly={readOnly} value={filter_term} onChange={onChangeFileTypeFilter} />);
             }
             if (column_key === PRIVATE_COLUMN_KEY.TAGS) {
diff --git a/frontend/src/metadata/constants/view/index.js b/frontend/src/metadata/constants/view/index.js
index 264711c992..0be5402b70 100644
--- a/frontend/src/metadata/constants/view/index.js
+++ b/frontend/src/metadata/constants/view/index.js
@@ -83,13 +83,9 @@ export const VIEW_TYPE_DEFAULT_BASIC_FILTER = {
   ],
   [VIEW_TYPE.MAP]: [
     {
-      column_key: PRIVATE_COLUMN_KEY.IS_DIR,
-      filter_predicate: FILTER_PREDICATE_TYPE.IS,
-      filter_term: 'file'
-    }, {
       column_key: PRIVATE_COLUMN_KEY.FILE_TYPE,
-      filter_predicate: FILTER_PREDICATE_TYPE.IS_ANY_OF,
-      filter_term: ['_picture']
+      filter_predicate: FILTER_PREDICATE_TYPE.IS,
+      filter_term: 'picture'
     }, {
       column_key: PRIVATE_COLUMN_KEY.TAGS,
       filter_predicate: FILTER_PREDICATE_TYPE.HAS_ALL_OF,
diff --git a/frontend/src/metadata/model/metadata/view.js b/frontend/src/metadata/model/metadata/view.js
index 93baf9de2a..3b2cbbfe82 100644
--- a/frontend/src/metadata/model/metadata/view.js
+++ b/frontend/src/metadata/model/metadata/view.js
@@ -17,8 +17,14 @@ class View {
 
     const defaultBasicFilters = VIEW_TYPE_DEFAULT_BASIC_FILTER[this.type];
     this.basic_filters = object.basic_filters && object.basic_filters.length > 0 ? object.basic_filters : defaultBasicFilters;
-    if (this.basic_filters.length !== defaultBasicFilters.length) {
+    if (this.basic_filters.length < defaultBasicFilters.length) {
       this.basic_filters = [...this.basic_filters, ...defaultBasicFilters.slice(this.basic_filters.length)];
+    } else if (this.basic_filters.length > defaultBasicFilters.length) {
+      this.basic_filters = defaultBasicFilters.map(defaultFilter => {
+        const filter = this.basic_filters.find(item => item.column_key === defaultFilter.column_key);
+        if (filter) return filter;
+        return defaultFilter;
+      });
     }
 
     // sort