diff --git a/src/components/filterComponent.js b/src/components/filterComponent.js
index 6f9c21ff2..9af4c5cc6 100644
--- a/src/components/filterComponent.js
+++ b/src/components/filterComponent.js
@@ -198,8 +198,6 @@
     const filterProps = (properties, id) => {
       return Object.values(properties).filter((prop) => {
         return (
-          // Always add the id
-          (prop.modelId === id && prop.name === 'id') ||
           // Add all properties besides the forbidden
           (prop.modelId === id &&
             !forbiddenKinds.includes(prop.kind) &&
@@ -363,6 +361,10 @@
         if (isNumberType) return 'number';
         return 'text';
       };
+
+      if (isBooleanType && row.rightValue === '') {
+        setGroups(updateRowProperty(row.rowId, groups, 'rightValue', false));
+      }
       const isTextType =
         !isSpecialType && !isBooleanType && !isDateTimeType && !isDateType;
       return (