diff --git a/src/lib/components/filters/content.svelte b/src/lib/components/filters/content.svelte
index 973802398..7e31df2ae 100644
--- a/src/lib/components/filters/content.svelte
+++ b/src/lib/components/filters/content.svelte
@@ -13,6 +13,7 @@
     import type { Column } from '$lib/helpers/types';
     import type { Writable } from 'svelte/store';
     import { tooltip } from '$lib/actions/tooltip';
+    import InputSelectSearch from '$lib/elements/forms/inputSelectSearch.svelte';
 
     export let columns: Writable<Column[]>;
 
@@ -83,6 +84,7 @@
         contains: {
             toQuery: Query.contains,
             toTag: (attribute, input) => {
+                console.log(attribute, input);
                 return {
                     value: input,
                     tag: `**${attribute}** contains **${Array.isArray(input) ? formatArray(input) : input}**`
@@ -110,6 +112,7 @@
     /* eslint  @typescript-eslint/no-explicit-any: 'off' */
     let value: any = null;
 
+    let search: string;
     $: {
         columnId;
         value = column?.array ? [] : null;
@@ -141,8 +144,6 @@
     }
 
     $: isDisabled = !operator;
-
-    $: console.log($tags);
 </script>
 
 <div>
@@ -168,26 +169,26 @@
         {#if column && operator && !operator?.hideInput}
             {#if column?.array}
                 <FormList class="u-margin-block-start-8">
-                    {#if column.type === 'enum'}
-                        test
-                        <!-- <InputSelect
+                    <InputTags
+                        label="values"
+                        showLabel={false}
                         id="value"
-                        placeholder="Select a value"
-                        required={true}
-                        options={column.enum.map((v) => ({ label: v, value: v }))}
-                        bind:value /> -->
-                    {:else}
-                        <InputTags
-                            label="values"
-                            showLabel={false}
-                            id="value"
-                            bind:tags={arrayValues}
-                            placeholder="Enter values" />
-                    {/if}
+                        bind:tags={arrayValues}
+                        placeholder="Enter values" />
                 </FormList>
             {:else}
                 <ul class="u-margin-block-start-8">
-                    {#if column.type === 'integer' || column.type === 'double'}
+                    {#if column.format === 'enum'}
+                        <InputSelectSearch
+                            id="value"
+                            bind:value
+                            bind:search
+                            placeholder="Select value"
+                            options={column?.elements?.map((value) => ({ label: value, value }))}
+                            label="Value"
+                            showLabel={false}
+                            interactiveOutput />
+                    {:else if column.type === 'integer' || column.type === 'double'}
                         <InputNumber id="value" bind:value placeholder="Enter value" />
                     {:else if column.type === 'boolean'}
                         <InputSelect
diff --git a/src/lib/helpers/types.ts b/src/lib/helpers/types.ts
index 4c10a11fb..45dcb0b92 100644
--- a/src/lib/helpers/types.ts
+++ b/src/lib/helpers/types.ts
@@ -37,6 +37,8 @@ export type Column = {
      */
     filter?: boolean;
     array?: boolean;
+    format?: string;
+    elements?: string[];
 };
 
 export function isValueOfStringEnum<T extends Record<string, string>>(
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte
index fd9f05552..7b5de902a 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte
@@ -29,7 +29,9 @@
             title: attribute.key,
             type: attribute.type as ColumnType,
             show: selected?.includes(attribute.key) ?? true,
-            array: attribute?.array
+            array: attribute?.array,
+            format: 'format' in attribute && attribute?.format === 'enum' ? attribute.format : null,
+            elements: 'elements' in attribute ? attribute.elements : null
         }))
     );
 
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
index b2d8bcb48..b888be29d 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
@@ -92,7 +92,10 @@
                 title: attribute.key,
                 type: attribute.type as ColumnType,
                 show: selected?.includes(attribute.key) ?? true,
-                array: attribute?.array
+                array: attribute?.array,
+                format:
+                    'format' in attribute && attribute?.format === 'enum' ? attribute.format : null,
+                elements: 'elements' in attribute ? attribute.elements : null
             }))
         );
     }