diff --git a/client/web/compose/src/components/Common/RecordListFilter.vue b/client/web/compose/src/components/Common/RecordListFilter.vue
index 807df9164..ff16dfa6b 100644
--- a/client/web/compose/src/components/Common/RecordListFilter.vue
+++ b/client/web/compose/src/components/Common/RecordListFilter.vue
@@ -566,12 +566,8 @@ export default {
       }
     },
 
-    onSetFocus (groupIndex, index) {
-      let focusIndex = this.$refs.delete.findIndex(r => r.id === `${groupIndex}-${index}`)
-      if (focusIndex > 0) {
-        focusIndex--
-      }
-      this.$refs.delete[focusIndex].focus()
+    onSetFocus () {
+      this.$refs.focusMe.focus()
     },
 
     onOpen () {
@@ -611,6 +607,8 @@ export default {
       // If no filterGroups, add default
       if (!this.componentFilter.length) {
         this.componentFilter.push(this.createDefaultFilterGroup(undefined, this.selectedField))
+      } else if (!this.inFilter) {
+        this.addFilter(0)
       }
     },
 
diff --git a/client/web/compose/src/components/PageBlocks/RecordListBase.vue b/client/web/compose/src/components/PageBlocks/RecordListBase.vue
index 73c6d6a56..65fcfeafe 100644
--- a/client/web/compose/src/components/PageBlocks/RecordListBase.vue
+++ b/client/web/compose/src/components/PageBlocks/RecordListBase.vue
@@ -733,7 +733,6 @@
 </template>
 <script>
 import axios from 'axios'
-import { isEqual } from 'lodash'
 import { mapGetters, mapActions } from 'vuex'
 import base from './base'
 import FieldViewer from 'corteza-webapp-compose/src/components/ModuleFields/Viewer'
@@ -1141,28 +1140,10 @@ export default {
 
     onFilter (filter = []) {
       filter.forEach(f => {
-        if (this.activeFilters.includes(f.name)) {
-          const filterPresets = this.filterPresets.find(p => p.name === f.name)
-
-          if (filterPresets) {
-            filterPresets.filter.forEach((filterPreset) => {
-              if (!isEqual(f.filter, filterPreset.filter)) {
-                const filterIndex = this.activeFilters.indexOf(f.name)
-                this.activeFilters.splice(filterIndex, 1)
-              }
-            })
-          }
-        }
-
-        if (f.filter.length === 1 && (!f.filter[0].value && !f.filter[0].name)) {
-          const filterIndex = this.activeFilters.indexOf(f.name)
-          this.activeFilters.splice(filterIndex, 1)
-        } else if (!this.activeFilters.includes(this.$t('recordList.customFilter'))) {
-          this.activeFilters.push(this.$t('recordList.customFilter'))
-          f.name = this.$t('recordList.customFilter')
-        }
+        f.name = this.$t('recordList.customFilter')
       })
 
+      this.activeFilters = [this.$t('recordList.customFilter')]
       this.recordListFilter = filter
       this.setStorageRecordListFilter()
       this.refresh(true)
@@ -1741,7 +1722,7 @@ export default {
           removeItem(`record-list-filters-${this.uniqueID}`)
         } else {
           this.recordListFilter = currentFilters
-          this.activeFilters = currentFilters.map(f => f.name)
+          this.activeFilters = [...new Set(currentFilters.map(f => f.name).filter(f => !!f))]
         }
       } catch (e) {
         // Land here if the filter is corrupted