diff --git a/src/lib/helpers/types/agentTypes.js b/src/lib/helpers/types/agentTypes.js
index e540b47d..e3b3e0b3 100644
--- a/src/lib/helpers/types/agentTypes.js
+++ b/src/lib/helpers/types/agentTypes.js
@@ -15,6 +15,7 @@
  * @property {string?} provider 
  * @property {string?} model
  * @property {number} max_recursion_depth
+ * @property {number?} [max_output_tokens]
  */
 
 
diff --git a/src/routes/page/agent/+page.svelte b/src/routes/page/agent/+page.svelte
index 97ff5437..202b92a6 100644
--- a/src/routes/page/agent/+page.svelte
+++ b/src/routes/page/agent/+page.svelte
@@ -66,6 +66,7 @@
 			filter = {
 				pager: initFilter.pager,
 				types: selectedAgentTypes?.length > 0 ? selectedAgentTypes : null,
+				labels: selectedAgentLabels?.length > 0 ? selectedAgentLabels : null,
 				similarName: event.payload || null
 			};
 			getPagedAgents();
diff --git a/src/routes/page/agent/[agentId]/+page.svelte b/src/routes/page/agent/[agentId]/+page.svelte
index db2bdecd..7b13aafe 100644
--- a/src/routes/page/agent/[agentId]/+page.svelte
+++ b/src/routes/page/agent/[agentId]/+page.svelte
@@ -79,7 +79,11 @@
             utilities: agent.utilities || [],
             knowledge_bases: agent.knowledge_bases || [],
             rules: agent.rules || [],
-            max_message_count: Number(agent.max_message_count) > 0 ? Number(agent.max_message_count) : null
+            max_message_count: Number(agent.max_message_count) > 0 ? Number(agent.max_message_count) : null,
+            llm_config: {
+                ...agent.llm_config,
+                max_output_tokens: Number(agent.llm_config.max_output_tokens) > 0 ? Number(agent.llm_config.max_output_tokens) : null
+            }
         };
         isLoading = true;
         saveAgent(agent).then(res => {
diff --git a/src/routes/page/agent/[agentId]/agent-components/agent-llm-config.svelte b/src/routes/page/agent/[agentId]/agent-components/agent-llm-config.svelte
index bf269952..d2c2c3e6 100644
--- a/src/routes/page/agent/[agentId]/agent-components/agent-llm-config.svelte
+++ b/src/routes/page/agent/[agentId]/agent-components/agent-llm-config.svelte
@@ -12,8 +12,8 @@
     /** @type {import('$commonTypes').LlmModelSetting[]} */
     let models = [];
 
-    const lowerLimit = 1;
-    const upperLimit = 10;
+    const recursiveDepthLowerLimit = 1;
+    const recursiveDepthUpperLimit = 10;
 
     let config = agent.llm_config;
 
@@ -59,14 +59,20 @@
     function changeMaxRecursiveDepth(e) {
         let value = Number(e.target.value) || 0;
         
-        if (value < lowerLimit) {
-            value = lowerLimit;
-        } else if (value > upperLimit) {
-            value = upperLimit;
+        if (value < recursiveDepthLowerLimit) {
+            value = recursiveDepthLowerLimit;
+        } else if (value > recursiveDepthUpperLimit) {
+            value = recursiveDepthUpperLimit;
         }
 
         config.max_recursion_depth = value;
     }
+
+    /** @param {any} e */
+    function changeMaxOutputToken(e) {
+        const value = Number(e.target.value) || 0;
+        config.max_output_tokens = value;
+    }
 </script>
 
 <Card>
@@ -113,11 +119,25 @@
                 <Input
                     style="text-align: center;"
                     type="number"
-                    min={lowerLimit}
-                    max={upperLimit}
+                    min={recursiveDepthLowerLimit}
+                    max={recursiveDepthUpperLimit}
                     value={config.max_recursion_depth}
                     on:change={e => changeMaxRecursiveDepth(e)}
-                />              
+                />
+            </div>
+        </div>
+
+        <div class="mb-3 row">
+            <label for="example-text-input" class="col-md-3 col-form-label">
+                Max output tokens
+            </label>
+            <div class="col-md-9">
+                <Input
+                    style="text-align: center;"
+                    type="number"
+                    value={config.max_output_tokens}
+                    on:change={e => changeMaxOutputToken(e)}
+                />
             </div>
         </div>
     </CardBody>