diff --git a/src/components/PlaygroundFilterGroup/index.tsx b/src/components/PlaygroundFilterGroup/index.tsx
index b5e25866..b988688b 100644
--- a/src/components/PlaygroundFilterGroup/index.tsx
+++ b/src/components/PlaygroundFilterGroup/index.tsx
@@ -32,7 +32,7 @@ const FilterGroup: FC<FilterGroupProps> = ({
         <Space key={m.index} size={10} align="center">
           <PlaygroundFilterSelect
             availableMembers={availableMembers}
-            value={t(m.dimension!.title)}
+            value={m.dimension?.name}
             onChange={(dimension) => {
               trackEvent("Update Member", { memberName: addMemberName });
               if (dimension) updateMethods.update(m, { ...m, dimension });
@@ -54,7 +54,7 @@ const FilterGroup: FC<FilterGroupProps> = ({
           </Select>
           <FilterInput
             member={m}
-            key="filterInput"
+            key={`${m.index}-${m.dimension?.name}-${m.operator}`}
             updateMethods={updateMethods}
             addMemberName={addMemberName}
           />
diff --git a/src/components/PlaygroundFilterInput/index.tsx b/src/components/PlaygroundFilterInput/index.tsx
index e2ae061d..751897ca 100644
--- a/src/components/PlaygroundFilterInput/index.tsx
+++ b/src/components/PlaygroundFilterInput/index.tsx
@@ -58,6 +58,19 @@ const filterInputs = {
       value={(values && values[0]) || ""}
     />
   ),
+  boolean: ({ values, onChange }: PlaygroundFilterInputProps) => (
+    <Select
+      size="large"
+      key="input"
+      style={{ width: 300 }}
+      value={values?.[0] ?? "true"}
+      onChange={(value) => onChange([value])}
+      options={[
+        { label: "True", value: "true" },
+        { label: "False", value: "false" },
+      ]}
+    />
+  ),
   time: ({ values, onChange }: PlaygroundFilterInputProps) => (
     <DatePicker
       size="large"
diff --git a/src/hooks/useAnalyticsQuery.ts b/src/hooks/useAnalyticsQuery.ts
index dae657ec..bdd51d76 100644
--- a/src/hooks/useAnalyticsQuery.ts
+++ b/src/hooks/useAnalyticsQuery.ts
@@ -17,6 +17,10 @@ const defaultFilterValues = {
   number: {
     operator: "set",
   },
+  boolean: {
+    operator: "equals",
+    values: ["true"],
+  },
 };
 
 interface Action {
@@ -68,11 +72,13 @@ const reducer: Reducer<PlaygroundState, Action> = (
         return state;
       }
     } else {
+      const filterDefaults =
+        defaultFilterValues[
+          action.operatorType as keyof typeof defaultFilterValues
+        ] ?? defaultFilterValues.string;
       value = {
         ...action.value,
-        ...defaultFilterValues[
-          action.operatorType as keyof typeof defaultFilterValues
-        ],
+        ...filterDefaults,
       };
     }
 
diff --git a/src/hooks/useDataSourcesMeta.ts b/src/hooks/useDataSourcesMeta.ts
index f4426e81..2005a277 100644
--- a/src/hooks/useDataSourcesMeta.ts
+++ b/src/hooks/useDataSourcesMeta.ts
@@ -33,6 +33,20 @@ const operators = {
     { name: "set", title: "is set" },
     { name: "notSet", title: "is not set" },
   ],
+  boolean: [
+    { name: "equals", title: "equals" },
+    { name: "notEquals", title: "does not equal" },
+    { name: "set", title: "is set" },
+    { name: "notSet", title: "is not set" },
+  ],
+  geo: [
+    { name: "contains", title: "contains" },
+    { name: "notContains", title: "does not contain" },
+    { name: "equals", title: "equals" },
+    { name: "notEquals", title: "does not equal" },
+    { name: "set", title: "is set" },
+    { name: "notSet", title: "is not set" },
+  ],
 };
 
 export const granularities = [
@@ -99,9 +113,9 @@ class Meta {
 
   filterOperatorsForMember(memberName: string, memberType: string | string[]) {
     const member = this.resolveMember(memberName, memberType);
-    return "type" in member
-      ? operators[member.type as keyof typeof operators]
-      : operators.string;
+    if (!("type" in member)) return operators.string;
+    const key = member.type as keyof typeof operators;
+    return operators[key] ?? operators.string;
   }
 }