diff --git a/src/lib/helpers/enums.js b/src/lib/helpers/enums.js
index 46bf4ba6..87011624 100644
--- a/src/lib/helpers/enums.js
+++ b/src/lib/helpers/enums.js
@@ -185,4 +185,11 @@ const llmModelType = {
     Embedding: 4,
     Audio: 5
 };
-export const LlmModelType = Object.freeze(llmModelType);
\ No newline at end of file
+export const LlmModelType = Object.freeze(llmModelType);
+
+const reasoningEffortLevel = {
+    Low: "low",
+    Medium: "medium",
+    High: "high"
+};
+export const ReasoningEffortLevel = Object.freeze(reasoningEffortLevel);
\ No newline at end of file
diff --git a/src/lib/helpers/types/agentTypes.js b/src/lib/helpers/types/agentTypes.js
index 5cf7c6b6..846bf31c 100644
--- a/src/lib/helpers/types/agentTypes.js
+++ b/src/lib/helpers/types/agentTypes.js
@@ -17,6 +17,7 @@
  * @property {string?} model
  * @property {number} max_recursion_depth
  * @property {number?} [max_output_tokens]
+ * @property {string?} [reasoning_effort_level]
  */
 
 
diff --git a/src/lib/helpers/types/knowledgeTypes.js b/src/lib/helpers/types/knowledgeTypes.js
index 5a23313d..00347c9d 100644
--- a/src/lib/helpers/types/knowledgeTypes.js
+++ b/src/lib/helpers/types/knowledgeTypes.js
@@ -15,6 +15,7 @@
  * @property {number} [limit] - Data limit.
  * @property {number} [confidence] - Confidence.
  * @property {boolean} [with_vector] - Include vector or not.
+ * @property {VectorFilterGroup[]} [filter_groups] - Search filter groups.
  */
 
 /**
@@ -22,8 +23,14 @@
  * @property {string | null} [start_id] - The start id.
  * @property {number} size - Page size.
  * @property {boolean} [with_vector] - Include vector or not.
- * @property {string[]} [included_payloads] - Included payload keys.
- * @property {{ key: string, value: string }[]} [search_pairs] - Search pairs.
+ * @property {string[]} [fields] - Included payload fields.
+ * @property {VectorFilterGroup[]} [filter_groups] - Search filter groups.
+ */
+
+/**
+ * @typedef {Object} VectorFilterGroup
+ * @property {string} [filter_operator] - The filter operator.
+ * @property {{ key: string, value: string }[]} [filters] - Search filters.
  */
 
 /**
@@ -32,6 +39,7 @@
  * @property {any} data - The knowledge data.
  * @property {number} [score] - The knowledge score.
  * @property {number[]} [vector] - The knowledge vector.
+ * @property {number} [vector_dimension] - The vector dimension.
  */
 
 /**
diff --git a/src/lib/helpers/utils/common.js b/src/lib/helpers/utils/common.js
index d9e782ee..cf22a03b 100644
--- a/src/lib/helpers/utils/common.js
+++ b/src/lib/helpers/utils/common.js
@@ -147,7 +147,7 @@ export function splitTextByCase(str) {
     if (!str) return str;
 
     let words = str.split("_");
-    if (words.length === 0) {
+    if (words.length === 1) {
         // split by camel case
         words = str.split(/(?=[A-Z])/);
     }
diff --git a/src/lib/scss/custom/pages/_knowledgebase.scss b/src/lib/scss/custom/pages/_knowledgebase.scss
index 6a581d0f..7d1f554d 100644
--- a/src/lib/scss/custom/pages/_knowledgebase.scss
+++ b/src/lib/scss/custom/pages/_knowledgebase.scss
@@ -41,6 +41,14 @@
     }
 }
 
+.operator-tooltip {
+    .tooltip-inner {
+        width: fit-content !important;
+        max-width: 300px !important;
+        text-align: left !important;
+    }
+}
+
 .knowledge-textarea {
     border-radius: 5px;
     border-color: var(--#{$prefix}light) !important;
@@ -245,6 +253,24 @@
             font-size: 15px;
         }
     }
+
+    .payload-container {
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+        max-height: 280px;
+        overflow-y: auto;
+        scrollbar-width: none;
+
+        .payload-item {
+            display: flex;
+            gap: 10px;
+
+            .payload-item-content {
+                flex: 0.5;
+            }
+        }
+    }
 }
 
 .knowledge-doc-upload-container {
@@ -360,6 +386,9 @@
         display: flex;
         flex-direction: column;
         gap: 10px;
+        max-height: 300px;
+        overflow-y: auto;
+        scrollbar-width: none;
     
         .knowledge-adv-search-item {
             display: flex;
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 03613d88..1c0127e8 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
@@ -3,6 +3,7 @@
     import { Card, CardBody, Input } from '@sveltestrap/sveltestrap';
     import { getLlmProviders, getLlmProviderModels } from '$lib/services/llm-provider-service';
 	import { INTEGER_REGEX } from '$lib/helpers/constants';
+	import { ReasoningEffortLevel } from '$lib/helpers/enums';
     
     /** @type {import('$agentTypes').AgentModel} */
     export let agent;
@@ -18,6 +19,14 @@
     }
 
     const recursiveDepthLowerLimit = 1;
+    /** @type {import('$commonTypes').LabelValuePair[]} */
+	const reasonLevelOptions = [
+        { value: '', label: '' },
+        ...Object.entries(ReasoningEffortLevel).map(([k, v]) => ({
+            value: v,
+            label: v
+        }))
+    ];
 
     let config = agent.llm_config;
 
@@ -89,6 +98,12 @@
         handleAgentChange();
     }
 
+    /** @param {any} e */
+    function changeReasoningEffortLevel(e) {
+        config.reasoning_effort_level = e.target.value || null;
+        handleAgentChange();
+    }
+
     /** @param {any} e */
     function validateIntegerInput(e) {
         const reg = new RegExp(INTEGER_REGEX, 'g');
@@ -164,5 +179,20 @@
                 />
             </div>
         </div>
+
+        <div class="mb-3 row">
+            <label for="example-text-input" class="col-md-3 col-form-label">
+                Reasoning level
+            </label>
+            <div class="col-md-9">
+                <Input type="select" value={config.reasoning_effort_level} on:change={e => changeReasoningEffortLevel(e)}>
+                    {#each reasonLevelOptions as option}
+                        <option value={option.value} selected={option.value == config.reasoning_effort_level}>
+                            {option.label}
+                        </option>
+                    {/each}
+                </Input>
+            </div>
+        </div>
     </CardBody>
 </Card>
\ No newline at end of file
diff --git a/src/routes/page/knowledge-base/common/search/advanced-search.svelte b/src/routes/page/knowledge-base/common/search/advanced-search.svelte
index 4825f13d..22304bd3 100644
--- a/src/routes/page/knowledge-base/common/search/advanced-search.svelte
+++ b/src/routes/page/knowledge-base/common/search/advanced-search.svelte
@@ -1,104 +1,131 @@
 <script>
-    import { onMount, onDestroy, createEventDispatcher  } from 'svelte';
+    import { onMount, onDestroy, tick } from 'svelte';
     import { fly } from 'svelte/transition';
-    import { Input, Tooltip } from '@sveltestrap/sveltestrap';
-    import util from "lodash";
-
-    const svelteDispatch = createEventDispatcher();
-    
-    const maxLength = 50;
-
-    
-    /** @type {{ key: string, displayName: string }[]} */
-    export let items;
+    import { Input, Tooltip, Button } from '@sveltestrap/sveltestrap';
+    import { v4 as uuidv4 } from 'uuid';
     
     /** @type {boolean} */
-    export let disabled = false;
+    export let showAdvSearch = false;
+
+    /** @type {{ uuid: string, key: string, value: string, checked: boolean }[]} */
+    export let items = [];
+
+    /** @type {string} */
+    export let operator = 'or';
+
+    /** @type {number} */
+    export let maxLength = 1000;
+
+    /** @type {number} */
+    export let limit = 10;
 
-    
     /** @type {boolean} */
-    let showAdvSearch = false;
+    export let disabled = false;
 
-    /** @type {{ key: string, displayName: string, checked: boolean, value: string }[]} */
-    let innerItems = [];
+    const logicalOperators = [
+        {
+            id: 'operator-and',
+            value: 'and',
+            label: 'AND',
+            tip: 'All of the conditions should match.'
+        },
+        {   
+            id: 'operator-or',
+            value: 'or',
+            label: 'OR',
+            tip: 'At least one of the conditions should match.'
+        }
+    ];
 
+    /** @type {HTMLElement} */
+    let scrollContainer;
 
-    onMount(() => {
-        init();
-    });
+    onMount(() => {});
 
     onDestroy(() => {
         reset();
     });
 
-    function init() {
-        showAdvSearch = false;
-        reset();
-    }
-
 
     /** @param {any} e */
     function toggleAdvSearch(e) {
         showAdvSearch = e.target.checked;
-        if (!showAdvSearch) {
-            reset();
-        }
     }
 
     function reset() {
-        innerItems = items?.map(x => {
-            return {
-                key: x.key,
-                checked: false,
-                displayName: x.displayName,
-                value: ''
-            };
-        }) || [];
+        items = [{ uuid: uuidv4(), key: '', value: '', checked: true }];
     }
 
     
     /**
-	 * @param {number} idx
      * @param {any} e
+     * @param {number} idx
 	 */
-    function toggleItemCheckbox(idx, e) {
-        const found = innerItems.find((_, index) => index === idx);
+    function toggleItem(e, idx) {
+        const found = items.find((_, index) => index === idx);
         if (found) {
             found.checked = e.target.checked;
-            innerItems = innerItems.map((x, index) => {
+            items = items.map((x, index) => {
                 return index === idx ? { ...found } : x;
             });
-            svelteDispatch('changeitems', {
-                searchItems: buildSearchItems()
-            });
+        }
+    }
+
+    /** @param {any} e */
+    async function addItem(e) {
+        e.preventDefault();
+        e.stopPropagation();
+
+        items = [
+            ...items,
+            { uuid: uuidv4(), key: '', value: '', checked: true }
+        ];
+
+        // Wait for DOM to update, then scroll to bottom
+        if (scrollContainer) {
+            await tick();
+            setTimeout(() => {
+                scrollContainer.scrollTo({
+                    top: scrollContainer.scrollHeight,
+                    behavior: 'smooth'
+                });
+            }, 0);
         }
     }
 
     /**
-	 * @param {number} idx
+     * @param {number} idx
+	 */
+    function removeItem(idx) {
+        if (disabled) return;
+
+        items = items.filter((_, index) => idx !== index);
+    }
+
+    /**
      * @param {any} e
+	 * @param {number} idx
+     * @param {string} key
 	 */
-    function changeItemValue(idx, e) {
-        const found = innerItems.find((_, index) => index === idx);
+    function changeItem(e, idx, key) {
+        const found = items.find((_, index) => index === idx);
         if (found) {
-            found.value = e.target.value;
-            innerItems = innerItems.map((x, index) => {
+            if (key === 'key') {
+                found.key = e.target.value;
+            } else if (key === 'value') {
+                found.value = e.target.value;
+            }
+            items = items.map((x, index) => {
                 return index === idx ? { ...found } : x;
             });
-            svelteDispatch('changeitems', {
-                searchItems: buildSearchItems()
-            });
         }
     }
 
-
-    function buildSearchItems() {
-        return innerItems?.filter(x => x.checked && !!util.trim(x.value))?.map(x => {
-            return {
-                key: x.key,
-                value: x.value
-            }
-        }) || [];
+    /**
+     * @param {any} e
+     */
+    function changeLogicalOperator(e) {
+        operator = e.target.value;
     }
 </script>
 
@@ -118,7 +145,7 @@
             />
         </div>
         <div class="line-align-center">
-            <div>{'Advance Search'}</div>
+            <div>{'Advanced Filters'}</div>
         </div>
         {#if showAdvSearch}
             <div class="line-align-center" id="adv-search-tooltip">
@@ -136,21 +163,39 @@
     {#if showAdvSearch}
         <div
             class={'knowledge-adv-search-items'}
+            bind:this={scrollContainer}
             in:fly={{ y: -10, duration: 500 }}
             out:fly={{ y: -10, duration: 200 }}
         >
-            {#each innerItems as item, idx (idx)}
+            <div class="knowledge-adv-search-item">
+                <div class="search-item-cb line-align-center">
+                    <div class="fw-bold">{''}</div>
+                </div>
+                <div class="search-item-content line-align-center">
+                    <div class="fw-bold">{'Name'}</div>
+                </div>
+                <div class="search-item-content line-align-center">
+                    <div class="fw-bold">{'Value'}</div>
+                </div>
+            </div>
+            {#each items as item, idx (item.uuid)}
                 <div class="knowledge-adv-search-item">
                     <div class="search-item-cb line-align-center">
                         <Input
                             type="checkbox"
                             disabled={disabled}
                             checked={item.checked}
-                            on:change={e => toggleItemCheckbox(idx, e)}
+                            on:change={e => toggleItem(e, idx)}
                         />
                     </div>
-                    <div class="search-item-name fw-bold line-align-center">
-                        <div>{`${item.displayName}:`}</div>
+                    <div class="search-item-content line-align-center">
+                        <Input
+                            type="text"
+                            disabled={!item.checked || disabled}
+                            maxlength={maxLength}
+                            value={item.key}
+                            on:input={e => changeItem(e, idx, 'key')}
+                        />
                     </div>
                     <div class="search-item-content line-align-center">
                         <Input
@@ -158,11 +203,71 @@
                             disabled={!item.checked || disabled}
                             maxlength={maxLength}
                             value={item.value}
-                            on:input={e => changeItemValue(idx, e)}
+                            on:input={e => changeItem(e, idx, 'value')}
                         />
                     </div>
+                    <div class="search-item-cb line-align-center" style="flex: 0 0 12px;">
+                        <div class="line-align-center">
+                            <!-- svelte-ignore a11y-click-events-have-key-events -->
+                            <!-- svelte-ignore a11y-no-static-element-interactions -->
+                            <i
+                                class="bx bx-no-entry text-danger clickable"
+                                class:hide={items.length === 1}
+                                on:click={() => removeItem(idx)}
+                            />
+                        </div>
+                    </div>
                 </div>
             {/each}
+            {#if items.length < limit}
+                <div class="knowledge-adv-search-item">
+                    <div class="search-item-cb line-align-center">
+                        <div class="fw-bold">{''}</div>
+                    </div>
+                    <div class="search-item-content line-align-center">
+                        <div class="fw-bold">{''}</div>
+                    </div>
+                    <div class="search-item-content line-align-center">
+                        <div class="d-flex justify-content-end">
+                            <Button
+                                color="link"
+                                style="width: fit-content"
+                                on:click={e => addItem(e)}
+                            >
+                                {'Add +'}
+                            </Button>
+                        </div>
+                    </div>
+                </div>
+            {/if}
+        </div>
+
+        <div class="mt-2">
+            <div class="d-flex align-items-center gap-5">
+                <span class="fw-bold">Search operator:</span>
+                {#each logicalOperators as op, idx (idx)}
+                    <div class="d-flex align-items-center gap-1">
+                        <Input
+                            type="radio"
+                            id={op.id}
+                            name="searchOperator"
+                            value={op.value}
+                            disabled={disabled}
+                            bind:group={operator}
+                            on:change={e => changeLogicalOperator(e)}
+                        />
+                        <label for={op.id} class="mb-0 d-flex gap-1">
+                            <span>{op.label}</span>
+                            <span class="line-align-center" id={`tooltip-${op.id}`}>
+                                <i class="bx bx-info-circle" />
+                            </span>
+                            <Tooltip target={`tooltip-${op.id}`} placement="top" class="operator-tooltip">
+                                <div>{op.tip}</div>
+                            </Tooltip>
+                        </label>
+                    </div>
+                {/each}
+            </div>
         </div>
     {/if}
 </div>
diff --git a/src/routes/page/knowledge-base/common/vector-table/vector-item-edit-modal.svelte b/src/routes/page/knowledge-base/common/vector-table/vector-item-edit-modal.svelte
index 1b72d0aa..4ae60bcb 100644
--- a/src/routes/page/knowledge-base/common/vector-table/vector-item-edit-modal.svelte
+++ b/src/routes/page/knowledge-base/common/vector-table/vector-item-edit-modal.svelte
@@ -1,5 +1,5 @@
 <script>
-    import { onMount } from "svelte";
+    import { onMount, tick } from "svelte";
 	import {
         Button,
         Form,
@@ -8,10 +8,12 @@
         ModalBody,
         ModalFooter,
         ModalHeader,
-        Row
+        Row,
+        Input
     } from "@sveltestrap/sveltestrap";
-    import { KnowledgeCollectionType } from "$lib/helpers/enums";
-    import _ from "lodash";
+    import { KnowledgeCollectionType, KnowledgePayloadName } from "$lib/helpers/enums";
+    import util from "lodash";
+    import { v4 as uuidv4 } from 'uuid';
 	
 
     /** @type {import('$knowledgeTypes').KnowledgeSearchViewModel | null} */
@@ -35,6 +37,18 @@
     /** @type {string} */
     export let size = 'md';
 
+    /** @type {boolean} */
+    export let allowPayload = true;
+
+    /** @type {number} */
+    export let payloadLimit = 10;
+
+    /** @type {string[]} */
+    export let excludedPayloads = [
+        KnowledgePayloadName.Text,
+        KnowledgePayloadName.DataSource
+    ];
+
     /** @type {() => void} */
     export let toggleModal;
 
@@ -46,8 +60,13 @@
 
     $: isQuestionAnswerCollection = collectionType === KnowledgeCollectionType.QuestionAnswer;
     $: isDocumentCollection = collectionType === KnowledgeCollectionType.Document;
-    $: disableConfirmBtn = !_.trim(question.text) || (isQuestionAnswerCollection && !_.trim(answer.text));
+    $: disableConfirmBtn = !util.trim(question.text) || (isQuestionAnswerCollection && !util.trim(answer.text));
 
+    /** @type {{ uuid: string, key: string, value: string }[]} */
+    let innerPayloads = [];
+
+    /** @type {HTMLElement} */
+    let scrollContainer;
 
     let question = {
         text: '',
@@ -76,19 +95,83 @@
             ...answer,
             text: item?.data?.answer || ''
         };
+
+        innerPayloads = Object.keys(item?.data || {}).filter(key => !excludedPayloads.includes(key)).map(key => {
+            return {
+                uuid: uuidv4(),
+                key: key,
+                value: item?.data[key]
+            };
+        });
+    }
+
+    /** @param {any} e */
+    async function addPayloadItem(e) {
+        e.preventDefault();
+        e.stopPropagation();
+
+        innerPayloads = [...innerPayloads, { uuid: uuidv4(), key: '', value: ''}];
+
+        if (allowPayload && scrollContainer) {
+            await tick();
+            setTimeout(() => {
+                scrollContainer.scrollTo({
+                    top: scrollContainer.scrollHeight,
+                    behavior: 'smooth'
+                });
+            }, 0);
+        }
+    }
+
+    /**
+     * @param {any} e
+	 * @param {number} idx
+     * @param {string} key
+	 */
+    function changePayloadItem(e, idx, key) {
+        const found = innerPayloads.find((_, index) => index === idx);
+        if (found) {
+            if (key === 'key') {
+                found.key = e.target.value;
+            } else if (key === 'value') {
+                found.value = e.target.value;
+            }
+            innerPayloads = innerPayloads.map((x, index) => {
+                return index === idx ? { ...found } : x;
+            });
+        }
+    }
+
+    /** @param {number} idx */
+    function removePayloadItem(idx) {
+        innerPayloads = innerPayloads.filter((_, index) => index !== idx);
     }
 
     /** @param {any} e */
     function handleConfirm(e) {
         e.preventDefault();
 
+        if (!allowPayload) {
+            innerPayloads = [];
+        }
+
+        const validPayloads = innerPayloads.map(x => ({ key: util.trim(x.key), value: util.trim(x.value) }))
+                                           .filter(x => !!x.key && !!x.value && !excludedPayloads.includes(x.key));
+                    
+        const obj = validPayloads.reduce((acc, cur) => {
+            // @ts-ignore
+            acc[cur.key] = cur.value;
+            return acc;
+        }, {});
+
         const newItem = {
             ...item,
             data: {
                 ...item?.data,
                 text: question.text,
                 answer: answer.text
-            }
+            },
+            payload: obj || {}
         };
         confirm?.(newItem);
     }
@@ -173,6 +256,71 @@
                 </FormGroup>
             </Row>
             {/if}
+
+            {#if allowPayload}
+            <Row class="mt-2">
+                <FormGroup>
+                    <div class="payload-container" bind:this={scrollContainer}>
+                        {#if innerPayloads.length > 0}
+                        <div class="payload-item">
+                            <div class="payload-item-content fw-bold">{'Name'}</div>
+                            <div class="payload-item-content fw-bold">{'Value'}</div>
+                            <div></div>
+                        </div>
+                        {/if}
+                        {#each innerPayloads as payload, idx (payload.uuid)}
+                        <div class="payload-item">
+                            <div class="payload-item-content line-align-center">
+                                <Input
+                                    type="text"
+                                    maxlength={1000}
+                                    value={payload.key}
+                                    on:input={e => changePayloadItem(e, idx, 'key')}
+                                />
+                            </div>
+                            <div class="payload-item-content line-align-center">
+                                <Input
+                                    type="text"
+                                    maxlength={1000}
+                                    value={payload.value}
+                                    on:input={e => changePayloadItem(e, idx, 'value')}
+                                />
+                            </div>
+                            <div class="line-align-center" style="flex: 0 0 12px;">
+                                <div class="line-align-center">
+                                    <!-- svelte-ignore a11y-click-events-have-key-events -->
+                                    <!-- svelte-ignore a11y-no-static-element-interactions -->
+                                    <i
+                                        class="bx bx-no-entry text-danger clickable"
+                                        on:click={() => removePayloadItem(idx)}
+                                    />
+                                </div>
+                            </div>
+                        </div>
+                        {/each}
+
+                        {#if innerPayloads.length < payloadLimit}
+                            <div class="payload-item">
+                                <div class="payload-item-content line-align-center">
+                                    <div class="fw-bold">{''}</div>
+                                </div>
+                                <div class="payload-item-content line-align-center">
+                                    <div class="d-flex justify-content-end">
+                                        <Button
+                                            color="link"
+                                            style="width: fit-content"
+                                            on:click={e => addPayloadItem(e)}
+                                        >
+                                            {'Add Payload +'}
+                                        </Button>
+                                    </div>
+                                </div>
+                            </div>
+                        {/if}
+                    </div>
+                </FormGroup>
+            </Row>
+            {/if}
         </Form>
     </ModalBody>
     <ModalFooter>
diff --git a/src/routes/page/knowledge-base/common/vector-table/vector-item.svelte b/src/routes/page/knowledge-base/common/vector-table/vector-item.svelte
index e73e329d..e964abcb 100644
--- a/src/routes/page/knowledge-base/common/vector-table/vector-item.svelte
+++ b/src/routes/page/knowledge-base/common/vector-table/vector-item.svelte
@@ -191,8 +191,8 @@
                                     {/if}
                                 {/each}
                             {/if}
-                            {#if item?.vector}
-                                <li class="more-detail-item wrappable">Vector dimension: {item?.vector?.length}</li>
+                            {#if item?.vector_dimension}
+                                <li class="more-detail-item wrappable">Vector dimension: {item?.vector_dimension}</li>
                             {/if}
                         </ul>
                     {/if}
diff --git a/src/routes/page/knowledge-base/documents/+page.svelte b/src/routes/page/knowledge-base/documents/+page.svelte
index d8efc46e..b582e5da 100644
--- a/src/routes/page/knowledge-base/documents/+page.svelte
+++ b/src/routes/page/knowledge-base/documents/+page.svelte
@@ -4,6 +4,7 @@
 	import { _ } from 'svelte-i18n';
 	import util from "lodash";
 	import Swal from 'sweetalert2';
+	import { v4 as uuidv4 } from 'uuid';
 	import {
         Button,
         Card,
@@ -83,8 +84,12 @@
 	/** @type {string} */
 	let editModalTitle = "Edit knowledge";
 
-	/** @type {import('$commonTypes').KeyValuePair[]} */
-	let searchItems = [];
+	/** @type {{ uuid: string, key: string, value: string, checked: boolean }[]} */
+	let searchItems = [{ uuid: uuidv4(), key: '', value: '', checked: true }];
+	/** @type {string} */
+	let selectedOperator = 'or';
+	/** @type {import('$knowledgeTypes').VectorFilterGroup[]} */
+	let innerSearchGroups = [];
 
 	/** @type {boolean} */
     let showDemo = true;
@@ -98,6 +103,7 @@
 	let isOpenEditKnowledge = false;
 	let isOpenCreateCollection = false;
 	let textSearch = false;
+	let isAdvSearchOn = false;
 	let disableSearchBtn = false;
 
     /** @type {any} */
@@ -108,7 +114,7 @@
 	 * isReset: boolean,
 	 * isLocalLoading: boolean,
 	 * skipLoader: boolean,
-	 * useSearhPair: boolean
+	 * filterGroups: any[]
 	 * }}
 	*/
 	const defaultParams = {
@@ -116,7 +122,7 @@
 		isReset: false,
 		isLocalLoading: false,
 		skipLoader: false,
-		useSearhPair: false
+		filterGroups: []
 	};
 
     $: disabled = isLoading || isLoadingMore || isSearching;
@@ -131,6 +137,7 @@
 		}
 	}
 
+
 	onMount(() => {
 		initData();
 	});
@@ -141,7 +148,8 @@
 			getData({
 				...defaultParams,
 				isReset: true,
-				skipLoader: true
+				skipLoader: true,
+				filterGroups: innerSearchGroups
 			}).finally(() => isLoading = false);
 		}).finally(() => {
 			isLoading = false;
@@ -156,9 +164,6 @@
 
 	function toggleTextSearch() {
 		textSearch = !textSearch;
-		if (!textSearch) {
-			searchItems = [];
-		}
 	}
 
 	function search() {
@@ -167,12 +172,14 @@
 		searchDone = false;
 		isFromSearch = false;
 
+		innerSearchGroups = buildSearchFilterGroups(searchItems);
+
 		if (textSearch) {
 			getData({
 				...defaultParams,
 				isReset: true,
 				skipLoader: true,
-				useSearhPair: true
+				filterGroups: innerSearchGroups
 			}).then(() => {
 				isFromSearch = true;
 			}).finally(() => {
@@ -180,12 +187,14 @@
 				searchDone = true;
 			});
 		} else {
-			searchVectorKnowledge(selectedCollection,
-			{
+			const params = {
 				text: util.trim(text),
 				confidence: Number(validateConfidenceNumber(confidence)),
-				with_vector: enableVector
-			}).then(res => {
+				with_vector: enableVector,
+				filter_groups: innerSearchGroups
+			};
+
+			searchVectorKnowledge(selectedCollection, params).then(res => {
 				items = res || [];
 				isFromSearch = true;
 			}).finally(() => {
@@ -216,7 +225,8 @@
 			...defaultParams,
 			startId: null,
 			isReset: true,
-			skipLoader: skipLoader
+			skipLoader: skipLoader,
+			filterGroups: innerSearchGroups
 		});
 	}
 
@@ -237,6 +247,8 @@
 		searchDone = false;
 		isFromSearch = false;
 		textSearch = false;
+		selectedOperator = 'or';
+		innerSearchGroups = [];
 	}
 
 
@@ -304,32 +316,20 @@
 	 * @param {{
 	 * startId: string | null,
 	 * isReset: boolean,
-	 * useSearhPair: boolean }} params
+	 * filterGroups: any[] }} params
 	 */
 	function getKnowledgeListData(params = {
 		startId: null,
 		isReset: false,
-		useSearhPair: false
+		filterGroups: []
 	}) {
 		return new Promise((resolve, reject) => {
-			/** @type {import('$commonTypes').KeyValuePair[]} */
-			let searchPairs = [];
-			if (params.useSearhPair) {
-				if (!!text) {
-					searchPairs = [ ...searchPairs, { key: KnowledgePayloadName.Text, value: text } ];
-				}
-
-				if (textSearch && searchItems.length > 0) {
-					searchPairs = [ ...searchPairs, ...searchItems ];
-				}
-			}
-
 			const filter = {
 				size: pageSize,
 				start_id: params.startId,
 				with_vector: enableVector,
-				included_payloads: [],
-				search_pairs: searchPairs
+				fields: [],
+				filter_groups: params.filterGroups
 			};
 
 			getVectorKnowledgePageList(
@@ -358,14 +358,14 @@
 	 * isReset: boolean,
 	 * isLocalLoading: boolean,
 	 * skipLoader: boolean,
-	 * useSearhPair: boolean }} params
+	 * filterGroups: any[] }} params
 	 */
 	function getData(params = {
 		startId: null,
 		isReset: false,
 		isLocalLoading: false,
 		skipLoader: false,
-		useSearhPair: false
+		filterGroups: []
 	}) {
 		return new Promise((resolve, reject) => {
 			if (!params.skipLoader) {
@@ -400,23 +400,12 @@
 	}
 
 	function loadMore() {
-		let params = { ...defaultParams };
-
-		if (textSearch) {
-			params = {
-				...params,
-				startId: nextId || null,
-				isLocalLoading: true,
-				useSearhPair: true
-			};
-		} else {
-			params = {
-				...params,
-				startId: nextId || null,
-				isLocalLoading: true,
-			};
-		}
-
+		const params = {
+			...defaultParams,
+			startId: nextId || null,
+			isLocalLoading: true,
+			filterGroups: innerSearchGroups
+		};
 		getData(params);
 	}
 
@@ -508,21 +497,18 @@
 	function confirmEdit(e) {
 		isLoading = true;
 		isOpenEditKnowledge = false;
-		const dataSource = e.data?.dataSource || VectorDataSource.User;
-		e.data.dataSource = dataSource;
+		e.payload = {
+			...e.payload || {},
+			dataSource: e.payload?.dataSource || VectorDataSource.User
+		};
 
 		if (!!editItem) {
-			const {
-				text,
-				answer,
-				...payload
-			} = e.data;
 			updateVectorKnowledgeData(
 				e.id,
 				editCollection,
 				e.data?.text,
-				e.data?.dataSource,
-				{ ...payload }
+				e.payload?.dataSource,
+				e.payload
 			).then(res => {
 				if (res) {
 					isComplete = true;
@@ -549,7 +535,8 @@
 			createVectorKnowledgeData(
 				editCollection,
 				e.data?.text,
-				e.data.dataSource
+				e.payload?.dataSource,
+				e.payload
 			).then(res => {
 				if (res) {
 					isComplete = true;
@@ -580,11 +567,12 @@
 	function refreshItems(newItem) {
 		const found = items?.find(x => x.id == newItem?.id);
 		if (found) {
-			found.data = {
-				...found.data,
+			const newData = {
 				text: newItem.data?.text || '',
-				dataSource: newItem.data?.dataSource,
+				...newItem.payload
 			};
+
+			found.data = { ...newData };
 			items = [ ...items ];
 		}
 	}
@@ -712,9 +700,23 @@
         }
     }
 
-	/** @param {any} e */
-	function onSearchItemsChanged(e) {
-		searchItems = e.detail.searchItems || [];
+	/**
+	 *  @param {any[]} items
+	 */
+	function buildSearchFilterGroups(items) {
+		/** @type {any[]} */
+		let groups = [];
+		if (textSearch && !!text) {
+			groups = [ ...groups, { filter_operator: 'or', filters: [{ key: KnowledgePayloadName.Text, value: text }] } ];
+		}
+
+		if (isAdvSearchOn && items?.length > 0) {
+			const validItems = items.filter(x => x.checked && !!util.trim(x.key) && !!util.trim(x.value))
+									.map(x => ({ key: util.trim(x.key), value: util.trim(x.value) }));
+			groups = [ ...groups, { filter_operator: selectedOperator, filters: validItems } ];
+		}
+
+		return groups;
 	}
 </script>
 
@@ -738,6 +740,11 @@
         collectionType={collectionType}
 		item={editItem}
 		open={isOpenEditKnowledge}
+		allowPayload
+		payloadLimit={10}
+		excludedPayloads={[
+			KnowledgePayloadName.Text
+		]}
 		toggleModal={() => isOpenEditKnowledge = !isOpenEditKnowledge}
 		confirm={(e) => confirmEdit(e)}
 		cancel={() => toggleKnowledgeEditModal()}
@@ -859,6 +866,7 @@
 								<Input
 									type="switch"
 									checked={textSearch}
+									disabled={disabled}
 									on:change={e => toggleTextSearch()}
 								/>
 							</div>
@@ -877,16 +885,12 @@
                         </div>
                     </div>
 
-					{#if textSearch}
-						<AdvancedSearch
-							on:changeitems={e => onSearchItemsChanged(e)}
-							disabled={disabled}
-							items={[
-								{ key: KnowledgePayloadName.FileName, displayName: "File name" },
-								{ key: KnowledgePayloadName.FileSource, displayName: "File source" }
-							]}
-						/>
-					{/if}
+					<AdvancedSearch
+						bind:showAdvSearch={isAdvSearchOn}
+						bind:items={searchItems}
+						bind:operator={selectedOperator}
+						disabled={disabled}
+					/>
 				
 					{#if isSearching}
 						<div class="knowledge-loader mt-5">
@@ -930,6 +934,7 @@
 									>
                                         <Button
                                             class="btn btn-sm btn-soft-primary knowledge-btn-icon"
+											disabled={disabled}
                                             on:click={() => onKnowledgeCreate()}
                                         >
                                             <i class="mdi mdi-plus" />
@@ -943,6 +948,7 @@
 									>
                                         <Button
                                             class="btn btn-sm btn-soft-danger knowledge-btn-icon"
+											disabled={disabled}
                                             on:click={() => onKnowledgeDeleteAll()}
                                         >
                                             <i class="mdi mdi-minus" />
@@ -968,6 +974,7 @@
 									>
 										<Button
 											class="btn btn-sm btn-soft-primary collection-action-btn"
+											disabled={disabled}
 											on:click={() => toggleCollectionCreate()}
 										>
 											<i class="mdi mdi-plus" />
@@ -981,6 +988,7 @@
 									>
 										<Button
 											class="btn btn-sm btn-soft-danger collection-action-btn"
+											disabled={disabled}
 											on:click={() => deleteCollection()}
 										>
 											<i class="mdi mdi-minus" />
@@ -1021,6 +1029,7 @@
 									<div class="mt-4 text-center">
 										<Button
 											class="btn btn-soft-primary"
+											disabled={disabled}
 											on:click={() => loadMore()}
 										>
 											{'Load more'}
diff --git a/src/routes/page/knowledge-base/question-answer/+page.svelte b/src/routes/page/knowledge-base/question-answer/+page.svelte
index 4f5fe15f..8b8aec28 100644
--- a/src/routes/page/knowledge-base/question-answer/+page.svelte
+++ b/src/routes/page/knowledge-base/question-answer/+page.svelte
@@ -4,6 +4,7 @@
 	import { _ } from 'svelte-i18n';
 	import util from "lodash";
 	import Swal from 'sweetalert2';
+	import { v4 as uuidv4 } from 'uuid';
 	import {
         Button,
         Card,
@@ -34,7 +35,7 @@
 	import VectorItem from '../common/vector-table/vector-item.svelte';
 	import VectorItemEditModal from '../common/vector-table/vector-item-edit-modal.svelte';
 	import CollectionCreateModal from '../common/collection/collection-create-modal.svelte';
-	
+	import AdvancedSearch from '../common/search/advanced-search.svelte';
 	
 	const pageSize = 8;
   	const duration = 2000;
@@ -75,6 +76,13 @@
 	/** @type {string} */
 	let editModalTitle = "Edit knowledge";
 
+	/** @type {{ uuid: string, key: string, value: string, checked: boolean }[]} */
+	let searchItems = [{ uuid: uuidv4(), key: '', value: '', checked: true }];
+	/** @type {string} */
+	let selectedOperator = 'or';
+	/** @type {import('$knowledgeTypes').VectorFilterGroup[]} */
+	let innerSearchGroups = [];
+
 	/** @type {boolean} */
 	let showDemo = true;
 	let isSearching = false;
@@ -87,6 +95,7 @@
 	let isOpenEditKnowledge = false;
 	let isOpenCreateCollection = false;
 	let textSearch = false;
+	let isAdvSearchOn = false;
 	let disableSearchBtn = false;
 
 	/** @type {{
@@ -94,7 +103,7 @@
 	 * isReset: boolean,
 	 * isLocalLoading: boolean,
 	 * skipLoader: boolean,
-	 * useSearhPair: boolean
+	 * filterGroups: any[]
 	 * }}
 	*/
 	const defaultParams = {
@@ -102,7 +111,7 @@
 		isReset: false,
 		isLocalLoading: false,
 		skipLoader: false,
-		useSearhPair: false
+		filterGroups: []
 	};
 
 	$: disabled = isLoading || isLoadingMore || isSearching;
@@ -110,6 +119,8 @@
 		disableSearchBtn = false;
 		if (isSearching || isLoadingMore) {
 			disableSearchBtn = true;
+		} else if (textSearch && searchItems.length > 0) {
+			disableSearchBtn = false;
 		} else if (!text || util.trim(text).length === 0) {
 			disableSearchBtn = true;
 		}
@@ -125,7 +136,8 @@
 			getData({
 				...defaultParams,
 				isReset: true,
-				skipLoader: true
+				skipLoader: true,
+				filterGroups: innerSearchGroups
 			}).finally(() => isLoading = false);
 		}).finally(() => {
 			isLoading = false;
@@ -138,18 +150,24 @@
 		showDemo = !showDemo;
 	}
 
+	function toggleTextSearch() {
+		textSearch = !textSearch;
+	}
+
 	function search() {
 		items = [];
 		isSearching = true;
 		searchDone = false;
 		isFromSearch = false;
 
+		innerSearchGroups = buildSearchFilterGroups(searchItems);
+
 		if (textSearch) {
 			getData({
 				...defaultParams,
 				isReset: true,
 				skipLoader: true,
-				useSearhPair: true
+				filterGroups: innerSearchGroups
 			}).then(() => {
 				isFromSearch = true;
 			}).finally(() => {
@@ -157,12 +175,14 @@
 				searchDone = true;
 			});
 		} else {
-			searchVectorKnowledge(selectedCollection,
-			{
+			const params = {
 				text: util.trim(text),
 				confidence: Number(validateConfidenceNumber(confidence)),
-				with_vector: enableVector
-			}).then(res => {
+				with_vector: enableVector,
+				filter_groups: innerSearchGroups
+			};
+
+			searchVectorKnowledge(selectedCollection, params).then(res => {
 				items = res || [];
 				isFromSearch = true;
 			}).finally(() => {
@@ -193,7 +213,8 @@
 			...defaultParams,
 			startId: null,
 			isReset: true,
-			skipLoader: skipLoader
+			skipLoader: skipLoader,
+			filterGroups: innerSearchGroups
 		});
 	}
 
@@ -214,6 +235,8 @@
 		searchDone = false;
 		isFromSearch = false;
 		textSearch = false;
+		selectedOperator = 'or';
+		innerSearchGroups = [];
 	}
 
 
@@ -281,23 +304,20 @@
 	 * @param {{
 	 * startId: string | null,
 	 * isReset: boolean,
-	 * useSearhPair: boolean }} params
+	 * filterGroups: any[] }} params
 	 */
 	function getKnowledgeListData(params = {
 		startId: null,
 		isReset: false,
-		useSearhPair: false
+		filterGroups: []
 	}) {
 		return new Promise((resolve, reject) => {
 			const filter = {
 				size: pageSize,
 				start_id: params.startId,
 				with_vector: enableVector,
-				included_payloads: includedPayloads,
-				search_pairs: params.useSearhPair ? [
-					{ key: KnowledgePayloadName.Text, value: text },
-					{ key: KnowledgePayloadName.Answer, value: text }
-				] : []
+				fields: [],
+				filter_groups: params.filterGroups
 			};
 
 			getVectorKnowledgePageList(
@@ -326,14 +346,14 @@
 	 * isReset: boolean,
 	 * isLocalLoading: boolean,
 	 * skipLoader: boolean,
-	 * useSearhPair: boolean }} params
+	 * filterGroups: any[] }} params
 	 */
 	function getData(params = {
 		startId: null,
 		isReset: false,
 		isLocalLoading: false,
 		skipLoader: false,
-		useSearhPair: false
+		filterGroups: []
 	}) {
 		return new Promise((resolve, reject) => {
 			if (!params.skipLoader) {
@@ -368,23 +388,12 @@
 	}
 
 	function loadMore() {
-		let params = { ...defaultParams };
-
-		if (textSearch) {
-			params = {
-				...params,
-				startId: nextId || null,
-				isLocalLoading: true,
-				useSearhPair: true
-			};
-		} else {
-			params = {
-				...params,
-				startId: nextId || null,
-				isLocalLoading: true,
-			};
-		}
-
+		const params = {
+			...defaultParams,
+			startId: nextId || null,
+			isLocalLoading: true,
+			filterGroups: innerSearchGroups
+		};
 		getData(params);
 	}
 
@@ -476,24 +485,21 @@
 	function confirmEdit(e) {
 		isLoading = true;
 		isOpenEditKnowledge = false;
-		const dataSource = e.data?.dataSource || VectorDataSource.User;
-		e.data.dataSource = dataSource;
+		e.payload = {
+			...e.payload || {},
+			dataSource: e.payload?.dataSource || VectorDataSource.User
+		};
 
 		if (!!editItem) {
-			const {
-				text,
-				...payload
-			} = e.data;
 			updateVectorKnowledgeData(
 				e.id,
 				editCollection,
 				e.data?.text,
-				e.data.dataSource,
-				{ ...payload }
+				e.payload?.dataSource,
+				{ answer: e.data?.answer, ...e.payload }
 			).then(res => {
 				if (res) {
 					isComplete = true;
-					e.data.dataSource = dataSource;
 					refreshItems(e);
 					resetEditData();
 					successText = "Knowledge has been updated!";
@@ -517,8 +523,8 @@
 			createVectorKnowledgeData(
 				editCollection,
 				e.data?.text,
-				e.data.dataSource,
-				{ answer: e.data?.answer }
+				e.payload?.dataSource,
+				{ answer: e.data?.answer, ...e.payload }
 			).then(res => {
 				if (res) {
 					isComplete = true;
@@ -549,12 +555,13 @@
 	function refreshItems(newItem) {
 		const found = items?.find(x => x.id == newItem?.id);
 		if (found) {
-			found.data = {
-				...found.data,
+			const newData = {
 				text: newItem.data?.text || '',
 				answer: newItem.data?.answer || '',
-				dataSource: newItem.data?.dataSource,
+				...newItem.payload
 			};
+
+			found.data = { ...newData };
 			items = [ ...items ];
 		}
 	}
@@ -638,6 +645,28 @@
             }
         });
 	}
+
+	/**
+	 *  @param {any[]} items
+	 */
+	function buildSearchFilterGroups(items) {
+		/** @type {any[]} */
+		let groups = [];
+		if (textSearch && !!text) {
+			groups = [ ...groups, { filter_operator: 'or', filters: [
+				{ key: KnowledgePayloadName.Text, value: text },
+				{ key: KnowledgePayloadName.Answer, value: text }
+			] } ];
+		}
+
+		if (isAdvSearchOn && items?.length > 0) {
+			const validItems = items.filter(x => x.checked && !!util.trim(x.key) && !!util.trim(x.value))
+									.map(x => ({ key: util.trim(x.key), value: util.trim(x.value) }));
+			groups = [ ...groups, { filter_operator: selectedOperator, filters: validItems } ];
+		}
+
+		return groups;
+	}
 </script>
 
 <HeadTitle title="{$_('Q&A Knowledge')}" />
@@ -660,6 +689,13 @@
 		collectionType={collectionType}
 		item={editItem}
 		open={isOpenEditKnowledge}
+		allowPayload
+		payloadLimit={10}
+		excludedPayloads={[
+			KnowledgePayloadName.Text,
+			KnowledgePayloadName.Question,
+			KnowledgePayloadName.Answer
+		]}
 		toggleModal={() => isOpenEditKnowledge = !isOpenEditKnowledge}
 		confirm={(e) => confirmEdit(e)}
 		cancel={() => toggleKnowledgeEditModal()}
@@ -780,7 +816,9 @@
 							<div class="line-align-center input-text search-toggle">
 								<Input
 									type="switch"
-									bind:checked={textSearch}
+									checked={textSearch}
+									disabled={disabled}
+									on:change={e => toggleTextSearch()}
 								/>
 							</div>
 							<div class="line-align-center input-text fw-bold">
@@ -797,6 +835,13 @@
 							</Button>
                         </div>
                     </div>
+
+					<AdvancedSearch
+						bind:showAdvSearch={isAdvSearchOn}
+						bind:items={searchItems}
+						bind:operator={selectedOperator}
+						disabled={disabled}
+					/>
 				
 					{#if isSearching}
 						<div class="knowledge-loader mt-5">
@@ -828,6 +873,7 @@
 									>
                                         <Button
                                             class="btn btn-sm btn-soft-primary knowledge-btn-icon"
+											disabled={disabled}
                                             on:click={() => onKnowledgeCreate()}
                                         >
                                             <i class="mdi mdi-plus" />
@@ -841,6 +887,7 @@
 									>
                                         <Button
                                             class="btn btn-sm btn-soft-danger knowledge-btn-icon"
+											disabled={disabled}
                                             on:click={() => onKnowledgeDeleteAll()}
                                         >
                                             <i class="mdi mdi-minus" />
@@ -849,14 +896,6 @@
 								</div>
 								<div class="collection-dropdown-container">
 									<div class="line-align-center collection-dropdown">
-										<!-- <Input
-											type="select"
-											on:change={(e) => changeCollection(e)}
-										>
-											{#each collections as option, idx (idx)}
-												<option value={option} selected={option === selectedCollection}>{option}</option>
-											{/each}
-										</Input> -->
 										<Select
 											tag={'kn-qa-collection-select'}
 											placeholder={'Select Collection'}
@@ -874,6 +913,7 @@
 									>
 										<Button
 											class="btn btn-sm btn-soft-primary collection-action-btn"
+											disabled={disabled}
 											on:click={() => toggleCollectionCreate()}
 										>
 											<i class="mdi mdi-plus" />
@@ -887,6 +927,7 @@
 									>
 										<Button
 											class="btn btn-sm btn-soft-danger collection-action-btn"
+											disabled={disabled}
 											on:click={() => deleteCollection()}
 										>
 											<i class="mdi mdi-minus" />
@@ -928,6 +969,7 @@
 									<div class="mt-4 text-center">
 										<Button
 											class="btn btn-soft-primary"
+											disabled={disabled}
 											on:click={() => loadMore()}
 										>
 											{'Load more'}