diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte
index b40b33744f..524b712755 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte
@@ -112,7 +112,7 @@
       Constants.OperatorOptions.NotEmpty.value,
     ]
     condition.noValue = noValueOptions.includes(newOperator)
-    if (condition.noValue) {
+    if (condition.noValue || condition.operator === "oneOf") {
       condition.referenceValue = null
       condition.valueType = "string"
     }
@@ -207,7 +207,14 @@
               />
               <Select
                 disabled={condition.noValue}
-                options={valueTypeOptions}
+                options={condition.operator === "oneOf"
+                  ? [
+                      {
+                        value: "string",
+                        label: "Binding",
+                      },
+                    ]
+                  : valueTypeOptions}
                 bind:value={condition.valueType}
                 placeholder={null}
                 on:change={e => onValueTypeChange(condition, e.detail)}
diff --git a/packages/frontend-core/src/utils/lucene.js b/packages/frontend-core/src/utils/lucene.js
index b6699628d1..b9f673668e 100644
--- a/packages/frontend-core/src/utils/lucene.js
+++ b/packages/frontend-core/src/utils/lucene.js
@@ -114,7 +114,7 @@ export const buildLuceneQuery = filter => {
           return
         }
       }
-      if (type === "number" && !Array.isArray(value)) {
+      if (type === "number" && typeof value === "string") {
         if (operator === "oneOf") {
           value = value.split(",").map(item => parseFloat(item))
         } else if (!isHbs) {