diff --git a/web/src/pages/agent/constant/index.tsx b/web/src/pages/agent/constant/index.tsx
index 5470bb7c7..3abe3ca2c 100644
--- a/web/src/pages/agent/constant/index.tsx
+++ b/web/src/pages/agent/constant/index.tsx
@@ -594,10 +594,7 @@ export const initialAgentValues = {
       type: 'string',
       value: '',
     },
-    [AgentStructuredOutputField]: {
-      type: 'Object Array String Number Boolean',
-      value: '',
-    },
+    [AgentStructuredOutputField]: {},
   },
 };
 
diff --git a/web/src/pages/agent/form/components/query-variable.tsx b/web/src/pages/agent/form/components/query-variable.tsx
index d315283c0..08efb94ca 100644
--- a/web/src/pages/agent/form/components/query-variable.tsx
+++ b/web/src/pages/agent/form/components/query-variable.tsx
@@ -38,8 +38,10 @@ export function QueryVariable({
       ? nextOptions.map((x) => {
           return {
             ...x,
-            options: x.options.filter((y) =>
-              types?.some((x) => toLower(y.type).includes(x)),
+            options: x.options.filter(
+              (y) =>
+                types?.some((x) => toLower(y.type).includes(x)) ||
+                y.type === undefined, // agent structured output
             ),
           };
         })
diff --git a/web/src/pages/agent/form/data-operations-form/filter-values.tsx b/web/src/pages/agent/form/data-operations-form/filter-values.tsx
index fca49f5ef..72a80cb09 100644
--- a/web/src/pages/agent/form/data-operations-form/filter-values.tsx
+++ b/web/src/pages/agent/form/data-operations-form/filter-values.tsx
@@ -9,6 +9,7 @@ import { ReactNode } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 import { DataOperationsOperatorOptions } from '../../constant';
 import { DynamicFormHeader } from '../components/dynamic-fom-header';
+import { PromptEditor } from '../components/prompt-editor';
 
 type SelectKeysProps = {
   name: string;
@@ -67,7 +68,7 @@ export function FilterValues({
               <Separator className="w-2" />
 
               <RAGFlowFormItem name={valueFieldAlias} className="flex-1">
-                <Input></Input>
+                <PromptEditor showToolbar={false} multiLine={false} />
               </RAGFlowFormItem>
               <Button variant={'ghost'} onClick={() => remove(index)}>
                 <X />
diff --git a/web/src/pages/agent/form/data-operations-form/select-keys.tsx b/web/src/pages/agent/form/data-operations-form/select-keys.tsx
index 2d494463b..9436c7c86 100644
--- a/web/src/pages/agent/form/data-operations-form/select-keys.tsx
+++ b/web/src/pages/agent/form/data-operations-form/select-keys.tsx
@@ -1,10 +1,10 @@
 import { RAGFlowFormItem } from '@/components/ragflow-form';
 import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
 import { X } from 'lucide-react';
 import { ReactNode } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 import { DynamicFormHeader } from '../components/dynamic-fom-header';
+import { PromptEditor } from '../components/prompt-editor';
 
 type SelectKeysProps = {
   name: string;
@@ -33,7 +33,7 @@ export function SelectKeys({ name, label, tooltip }: SelectKeysProps) {
           return (
             <div key={field.id} className="flex items-center gap-2">
               <RAGFlowFormItem name={nameField} className="flex-1">
-                <Input></Input>
+                <PromptEditor showToolbar={false} multiLine={false} />
               </RAGFlowFormItem>
               <Button variant={'ghost'} onClick={() => remove(index)}>
                 <X />
diff --git a/web/src/pages/agent/form/data-operations-form/updates.tsx b/web/src/pages/agent/form/data-operations-form/updates.tsx
index fba1cd5ac..d401e0463 100644
--- a/web/src/pages/agent/form/data-operations-form/updates.tsx
+++ b/web/src/pages/agent/form/data-operations-form/updates.tsx
@@ -6,6 +6,7 @@ import { X } from 'lucide-react';
 import { ReactNode } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 import { DynamicFormHeader } from '../components/dynamic-fom-header';
+import { PromptEditor } from '../components/prompt-editor';
 
 type SelectKeysProps = {
   name: string;
@@ -47,7 +48,7 @@ export function Updates({
               </RAGFlowFormItem>
               <Separator className="w-2" />
               <RAGFlowFormItem name={valueFieldAlias} className="flex-1">
-                <Input></Input>
+                <PromptEditor showToolbar={false} multiLine={false} />
               </RAGFlowFormItem>
               <Button variant={'ghost'} onClick={() => remove(index)}>
                 <X />