diff --git a/client/web/compose/src/components/Common/FilterToolbox.vue b/client/web/compose/src/components/Common/FilterToolbox.vue
index 04b56745c..77c740b25 100644
--- a/client/web/compose/src/components/Common/FilterToolbox.vue
+++ b/client/web/compose/src/components/Common/FilterToolbox.vue
@@ -76,14 +76,13 @@
 
           <b-td
             v-if="getField(filter.name)"
-            class="align-middle"
             style="width: 1%;"
           >
             <b-button
               :id="`${groupIndex}-${index}`"
               ref="delete"
               variant="outline-extra-light"
-              class="d-block text-dark border-0 h-full ml-2 px-2"
+              class="d-block text-dark border-0 h-full ml-2 px-2 mt-1"
               @click="deleteFilter(groupIndex, index)"
             >
               <font-awesome-icon
@@ -486,7 +485,6 @@ export default {
 td {
   padding: 0;
   padding-bottom: 0.5rem;
-  vertical-align: middle;
 }
 
 .btn-add-group {
diff --git a/client/web/compose/src/components/Common/RecordListFilter.vue b/client/web/compose/src/components/Common/RecordListFilter.vue
index 7c711665f..6d988ac4c 100644
--- a/client/web/compose/src/components/Common/RecordListFilter.vue
+++ b/client/web/compose/src/components/Common/RecordListFilter.vue
@@ -41,6 +41,7 @@
             :selected-field="selectedField"
             :namespace="namespace"
             :mock.sync="mock"
+            start-empty
             @prevent-close="onValueChange"
           />
         </b-card-body>
@@ -306,7 +307,7 @@ export default {
       // If no filterGroups, add default
       if (!this.componentFilter.length) {
         this.componentFilter.push(this.createDefaultFilterGroup(undefined, this.selectedField))
-      } else if (!this.inFilter) {
+      } else if (this.selectedField && !this.inFilter) {
         this.addFilter(0)
       }
     },