diff --git a/src/lib/components/filters/content.svelte b/src/lib/components/filters/content.svelte
index 11eb886bc..86a6020b9 100644
--- a/src/lib/components/filters/content.svelte
+++ b/src/lib/components/filters/content.svelte
@@ -12,6 +12,7 @@
     import { tags, type Operator, queries } from './store';
     import type { Column } from '$lib/helpers/types';
     import type { Writable } from 'svelte/store';
+    import { tooltip } from '$lib/actions/tooltip';
 
     export let columns: Writable<Column[]>;
 
@@ -81,8 +82,12 @@
         },
         contains: {
             toQuery: Query.contains,
-            toTag: (attribute, input) =>
-                `**${attribute}** contains **${Array.isArray(input) ? input.join(' or') : input}**`,
+            toTag: (attribute, input) => {
+                return {
+                    value: input,
+                    tag: `**${attribute}** contains **${Array.isArray(input) ? formatArray(input) : input}**`
+                };
+            },
             types: ['string', 'integer', 'double', 'boolean', 'datetime', 'enum']
         }
     };
@@ -113,16 +118,31 @@
     // This Map is keyed by tags, and has a query as the value
     function addFilter() {
         if (!column || !operator) return;
-
-        queries.addFilter({ column, operator, value: value ?? '' });
-        value = null;
+        if (column.array) {
+            queries.addFilter({ column, operator, value: arrayValues });
+            arrayValues = [];
+        } else {
+            queries.addFilter({ column, operator, value: value ?? '' });
+            value = null;
+        }
     }
 
     function tagFormat(node: HTMLElement) {
         node.innerHTML = node.innerHTML.replace(/\*\*(.*?)\*\*/g, '<b>$1</b>');
     }
 
+    function formatArray(array: string[]) {
+        if (!array?.length) return;
+        if (array.length > 2) {
+            return `${array[0]} or ${array.length - 1} others`;
+        } else {
+            return array.join(' or ');
+        }
+    }
+
     $: isDisabled = !operator;
+
+    $: console.log($tags);
 </script>
 
 <div>
@@ -194,12 +214,16 @@
     <ul class="u-flex u-flex-wrap u-cross-center u-gap-8 u-margin-block-start-16 tags">
         {#each $tags as tag (tag)}
             <button
+                use:tooltip={{
+                    content: tag?.value,
+                    disabled: !tag?.value?.length
+                }}
                 class="tag"
                 on:click={() => {
                     queries.removeFilter(tag);
                 }}>
                 <span class="text" use:tagFormat>
-                    {tag}
+                    {tag?.tag ?? tag}
                 </span>
                 <i class="icon-x" />
             </button>
diff --git a/src/lib/components/filters/store.ts b/src/lib/components/filters/store.ts
index aa027c74f..13dc1f9b7 100644
--- a/src/lib/components/filters/store.ts
+++ b/src/lib/components/filters/store.ts
@@ -6,8 +6,11 @@ import deepEqual from 'deep-equal';
 import type { Column, ColumnType } from '$lib/helpers/types';
 
 export type Operator = {
-    toTag: (attribute: string, input?: string | number) => string;
-    toQuery: (attribute: string, input?: string | number) => string;
+    toTag: (
+        attribute: string,
+        input?: string | number | string[]
+    ) => string | { tag: string; value: string };
+    toQuery: (attribute: string, input?: string | number | string[]) => string;
     types: ColumnType[];
     hideInput?: boolean;
 };
@@ -22,13 +25,13 @@ export function queryParamToMap(queryParam: string) {
     return new Map(queries);
 }
 
-function initQueries(initialValue = new Map<string, string>()) {
+function initQueries(initialValue = new Map<string, string | { tag: string; value: string }>()) {
     const queries = writable(initialValue);
 
     type AddFilterArgs = {
         operator: Operator;
         column: Column;
-        value: string | number;
+        value: string | number | string[];
     };
 
     function addFilter({ column, operator, value }: AddFilterArgs) {