diff --git a/apps/frontend/src/lib/components/blocks/base/share-base-nav.svelte b/apps/frontend/src/lib/components/blocks/base/share-base-nav.svelte
index f619cf28f..83e57077a 100644
--- a/apps/frontend/src/lib/components/blocks/base/share-base-nav.svelte
+++ b/apps/frontend/src/lib/components/blocks/base/share-base-nav.svelte
@@ -4,6 +4,7 @@
   import { ChevronRightIcon, DatabaseIcon, HardDriveIcon, SheetIcon } from "lucide-svelte"
   import * as Collapsible from "$lib/components/ui/collapsible"
   import { cn } from "$lib/utils"
+  import { setShareId } from "$lib/store/share.store.svelte"
 
   export let base: {
     id: string
@@ -27,6 +28,10 @@
 
   $: active = !tableId && !viewId
   let open: Record<string, boolean> = {}
+
+  $: if (shareId) {
+    setShareId(shareId)
+  }
 </script>
 
 <nav class="items-start gap-1 px-1.5 text-sm font-medium">
diff --git a/apps/frontend/src/lib/components/blocks/filters-editor/filters-editor.svelte b/apps/frontend/src/lib/components/blocks/filters-editor/filters-editor.svelte
index 923d4f0f6..22a60e508 100644
--- a/apps/frontend/src/lib/components/blocks/filters-editor/filters-editor.svelte
+++ b/apps/frontend/src/lib/components/blocks/filters-editor/filters-editor.svelte
@@ -8,6 +8,10 @@
     FieldIdVo,
     type Conjunction,
     type FieldType,
+    addMaybeCondition,
+    addMaybeConditionGroup,
+    removeCondition,
+    swapCondition,
   } from "@undb/table"
   import FilterField from "./filter-field.svelte"
   import Button from "$lib/components/ui/button/button.svelte"
@@ -34,6 +38,7 @@
   export let filter: (field: IField) => boolean = () => true
   export let disabled = false
   export let readonly = false
+  export let sameWidth = true
 
   export let onValueChange: ((value: MaybeConditionGroup<any> | undefined) => void) | undefined = undefined
 
@@ -54,11 +59,7 @@
       value: undefined,
       option: {},
     }
-    if (!value) {
-      value = { children: [filter], conjunction: defaultConjunction, id: uid(10), option: {} }
-    } else {
-      value.children = [...value.children, filter]
-    }
+      value = addMaybeCondition(value, filter, defaultConjunction)
   }
 
   function addConditionGroup() {
@@ -68,30 +69,16 @@
       option: {},
       children: [],
     }
-    if (!value) {
-      value = { children: [conditionGroup], conjunction: defaultConjunction, id: uid(10), option: {} }
-    } else {
-      value.children = [...value.children, conditionGroup]
-    }
+      value = addMaybeConditionGroup(value, conditionGroup, defaultConjunction)
   }
 
   function removeFilter(index: number) {
-    if (value) {
-      value.children.splice(index, 1)
-      value.children = [...value.children]
-    }
+      value = removeCondition(value, index)
   }
 
   function swapFilter(oldIndex: number, newIndex: number) {
-    if (value) {
-      const filters = [...value.children]
-      const [removed] = filters.splice(oldIndex, 1)
-      filters.splice(newIndex, 0, removed)
-      value.children = [...filters]
-    }
+      value = swapCondition(value, oldIndex, newIndex)
   }
-
-  export let sameWidth = true
 </script>
 
 <div use:autoAnimate class={cn("space-y-2", isEven ? "bg-muted" : "bg-popover", $$restProps.class)} data-level={level}>
@@ -141,6 +128,7 @@
 
                     child = child
                     value = value
+                    onValueChange?.(value)
                   }
                 }}
                 {filter}
@@ -227,33 +215,33 @@
     <slot name="empty" />
   {/if}
   {#if !readonly}
-    <div class={cn("flex justify-between px-4", value?.children.length ? "border-t py-2" : "py-3")}>
-      <div class="flex items-center gap-2">
-        {#if !readonly && $hasPermission("table:update")}
-          <Button disabled={!filteredFields.length || disabled} variant="ghost" size="sm" on:click={addCondition}>
-            <PlusIcon class="mr-2 h-3 w-3" />
-            {$LL.table.common.condition.add()}
-          </Button>
-          {#if !disableGroup}
-            {#if level < 3}
-              <Button
-                disabled={!filteredFields.length || disabled}
-                variant="ghost"
-                class="text-muted-foreground"
-                size="sm"
-                on:click={addConditionGroup}
-              >
-                <PlusIcon class="mr-2 h-3 w-3" />
-                {$LL.table.common.condition.addGroup()}
-              </Button>
-            {/if}
+  <div class={cn("flex justify-between px-4", value?.children.length ? "border-t py-2" : "py-3")}>
+    <div class="flex items-center gap-2">
+      {#if ( !readonly && $hasPermission("table:update")) }
+        <Button disabled={!filteredFields.length || disabled} variant="ghost" size="sm" on:click={addCondition}>
+          <PlusIcon class="mr-2 h-3 w-3" />
+          {$LL.table.common.condition.add()}
+        </Button>
+        {#if !disableGroup}
+          {#if level < 3}
+            <Button
+              disabled={!filteredFields.length || disabled}
+              variant="ghost"
+              class="text-muted-foreground"
+              size="sm"
+              on:click={addConditionGroup}
+            >
+              <PlusIcon class="mr-2 h-3 w-3" />
+              {$LL.table.common.condition.addGroup()}
+            </Button>
           {/if}
         {/if}
-      </div>
-
-      {#if !readonly && $hasPermission("table:update")}
-        <slot name="footer" />
       {/if}
     </div>
-  {/if}
+
+    {#if !readonly && $hasPermission("table:update")}
+      <slot name="footer" />
+    {/if}
+  </div>
+{/if}
 </div>
diff --git a/apps/frontend/src/lib/components/blocks/gallery-view/gallery-view.svelte b/apps/frontend/src/lib/components/blocks/gallery-view/gallery-view.svelte
index 69b6c568c..4c2a1dfff 100644
--- a/apps/frontend/src/lib/components/blocks/gallery-view/gallery-view.svelte
+++ b/apps/frontend/src/lib/components/blocks/gallery-view/gallery-view.svelte
@@ -79,7 +79,7 @@
   $: total = ($getRecordsQuery.data as any)?.total
 </script>
 
-<TableTools {r} {viewId} {readonly}>
+<TableTools {r} {viewId} {readonly} {shareId}>
   {#if !shareId}
     <GalleryViewOptionButton {view} {readonly} />
   {/if}
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/grid-view-data-table.svelte b/apps/frontend/src/lib/components/blocks/grid-view/grid-view-data-table.svelte
index 1db4fed91..aedf35409 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/grid-view-data-table.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/grid-view-data-table.svelte
@@ -43,6 +43,7 @@
   export let total: number
   export let hidePagination = false
   export let r: Writable<string | null>
+  export let shareId: string | undefined
 
   const t = getTable()
 
@@ -181,7 +182,7 @@
 
 <div class="flex h-full w-full flex-col">
   {#if !readonly}
-    <TableTools {r} {viewId}>
+    <TableTools {r} {viewId} {shareId}>
       {#if selectedRecordIds.length}
         <SelectedRecordsButton
           {viewId}
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/grid-view.svelte b/apps/frontend/src/lib/components/blocks/grid-view/grid-view.svelte
index db452d669..0994e84af 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/grid-view.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/grid-view.svelte
@@ -85,6 +85,7 @@
   {perPage}
   {currentPage}
   {r}
+  {shareId}
   isLoading={$getRecords.isLoading}
   total={$getRecords.data?.total ?? 0}
 />
diff --git a/apps/frontend/src/lib/components/blocks/kanban-view/kanban-view.svelte b/apps/frontend/src/lib/components/blocks/kanban-view/kanban-view.svelte
index a4fa82a2f..b394d8808 100644
--- a/apps/frontend/src/lib/components/blocks/kanban-view/kanban-view.svelte
+++ b/apps/frontend/src/lib/components/blocks/kanban-view/kanban-view.svelte
@@ -31,7 +31,7 @@
 </script>
 
 {#key $table.id.value}
-  <TableTools {readonly} {viewId} {r}>
+  <TableTools {readonly} {viewId} {r} {shareId}>
     {#if !shareId}
       <KanbanOptionButton {view} {readonly} />
     {/if}
diff --git a/apps/frontend/src/lib/components/blocks/list-view/list-view.svelte b/apps/frontend/src/lib/components/blocks/list-view/list-view.svelte
index 307347dcf..1810df2c3 100644
--- a/apps/frontend/src/lib/components/blocks/list-view/list-view.svelte
+++ b/apps/frontend/src/lib/components/blocks/list-view/list-view.svelte
@@ -72,7 +72,7 @@
   $: total = ($getRecordsQuery.data as any)?.total
 </script>
 
-<TableTools {r} {readonly} {viewId} />
+<TableTools {r} {readonly} {viewId} {shareId}/>
 
 <div class={cn("flex-1 overflow-y-auto overflow-x-hidden")}>
   {#if $isLoading}
diff --git a/apps/frontend/src/lib/components/blocks/share/share-button.svelte b/apps/frontend/src/lib/components/blocks/share/share-button.svelte
index c3e47f86a..e2a88801c 100644
--- a/apps/frontend/src/lib/components/blocks/share/share-button.svelte
+++ b/apps/frontend/src/lib/components/blocks/share/share-button.svelte
@@ -7,7 +7,7 @@
   import { createMutation } from "@tanstack/svelte-query"
   import { CopyIcon, ShareIcon, CopyCheckIcon, ExternalLinkIcon, QrCodeIcon } from "lucide-svelte"
   import * as Popover from "$lib/components/ui/popover"
-  import { shareStore } from "$lib/store/share.store"
+  import { shareStore } from "$lib/store/share.store.svelte"
   import { invalidate } from "$app/navigation"
   import { Input } from "$lib/components/ui/input"
   import { getIframe, getShareUrl, type IShareTarget } from "@undb/share"
diff --git a/apps/frontend/src/lib/components/blocks/share/share-grid-view.svelte b/apps/frontend/src/lib/components/blocks/share/share-grid-view.svelte
index 665fb6021..34b2c5646 100644
--- a/apps/frontend/src/lib/components/blocks/share/share-grid-view.svelte
+++ b/apps/frontend/src/lib/components/blocks/share/share-grid-view.svelte
@@ -70,6 +70,7 @@
     readonly
     {perPage}
     {currentPage}
+    {shareId}
     isLoading={$getRecords.isLoading}
     total={$getRecords.data?.total ?? 0}
   />
diff --git a/apps/frontend/src/lib/components/blocks/table-tools/table-tools.svelte b/apps/frontend/src/lib/components/blocks/table-tools/table-tools.svelte
index 933a17c0b..f25f459a8 100644
--- a/apps/frontend/src/lib/components/blocks/table-tools/table-tools.svelte
+++ b/apps/frontend/src/lib/components/blocks/table-tools/table-tools.svelte
@@ -14,6 +14,7 @@
   export let readonly = false
   export let r: Writable<string | null>
   export let viewId: Readable<string | undefined>
+  export let shareId: string | undefined
 
   const isPlayground = getIsPlayground()
 </script>
@@ -23,7 +24,7 @@
     {#if !readonly}
       <CreateRecordButton />
     {/if}
-    <ViewFilterEditor {readonly} {viewId} />
+    <ViewFilterEditor {readonly} {viewId} {shareId} />
     <ViewColorEditor {readonly} {viewId} />
     <ViewSort {readonly} {viewId} />
     <ViewFields {readonly} {viewId} />
diff --git a/apps/frontend/src/lib/components/blocks/view-color-editor/view-color-editor.svelte b/apps/frontend/src/lib/components/blocks/view-color-editor/view-color-editor.svelte
index 91b82e428..037c43da1 100644
--- a/apps/frontend/src/lib/components/blocks/view-color-editor/view-color-editor.svelte
+++ b/apps/frontend/src/lib/components/blocks/view-color-editor/view-color-editor.svelte
@@ -97,9 +97,7 @@
       </Button>
       <div slot="empty" class="flex flex-col items-center gap-3 px-4 py-6 text-center">
         <FilterXIcon class="text-primary h-10 w-10" />
-        <h3 class="text-muted-foreground text-sm font-semibold tracking-tight">
-          {$LL.table.common.colorEmpty()}
-        </h3>
+        <h3 class="text-muted-foreground text-sm tracking-tight">{$LL.table.common.colorEmpty()}</h3>
       </div>
     </FiltersEditor>
   </Popover.Content>
diff --git a/apps/frontend/src/lib/components/blocks/view-filter-editor/view-filter-editor.svelte b/apps/frontend/src/lib/components/blocks/view-filter-editor/view-filter-editor.svelte
index 26e57ce8c..213fe057a 100644
--- a/apps/frontend/src/lib/components/blocks/view-filter-editor/view-filter-editor.svelte
+++ b/apps/frontend/src/lib/components/blocks/view-filter-editor/view-filter-editor.svelte
@@ -103,7 +103,7 @@
 
       <div slot="empty" class="flex flex-col items-center gap-3 px-4 py-6 text-center">
         <FilterXIcon class="text-primary h-10 w-10" />
-        <h3 class="text-muted-foreground text-sm font-semibold tracking-tight">
+        <h3 class="text-muted-foreground text-sm tracking-tight">
           {$LL.table.common.filter.empty()}
         </h3>
       </div>
diff --git a/apps/frontend/src/lib/components/blocks/view-sort/view-sort.svelte b/apps/frontend/src/lib/components/blocks/view-sort/view-sort.svelte
index cc139ad9a..e015bd8d5 100644
--- a/apps/frontend/src/lib/components/blocks/view-sort/view-sort.svelte
+++ b/apps/frontend/src/lib/components/blocks/view-sort/view-sort.svelte
@@ -1,18 +1,8 @@
 <script lang="ts">
   import * as Popover from "$lib/components/ui/popover/index.js"
   import { Button } from "$lib/components/ui/button/index.js"
-  import * as Select from "$lib/components/ui/select"
   import Badge from "$lib/components/ui/badge/badge.svelte"
-  import {
-    ArrowDownAzIcon,
-    ArrowUpDownIcon,
-    ArrowUpZaIcon,
-    GripVerticalIcon,
-    Trash2Icon,
-    PlusIcon,
-    SortAscIcon,
-    LoaderCircleIcon,
-  } from "lucide-svelte"
+  import { ArrowUpDownIcon, GripVerticalIcon, Trash2Icon, PlusIcon, SortAscIcon, LoaderCircleIcon } from "lucide-svelte"
   import { cn } from "$lib/utils"
   import { SortableList } from "@jhubbardsf/svelte-sortablejs"
   import type { Readable } from "svelte/store"
@@ -20,7 +10,6 @@
   import { type IViewSort, isFieldSortable } from "@undb/table"
   import FieldPicker from "../field-picker/field-picker.svelte"
   import { createMutation, useQueryClient } from "@tanstack/svelte-query"
-  import { trpc } from "$lib/trpc/client"
   import { invalidate } from "$app/navigation"
   import { isNumber } from "radash"
   import { onMount } from "svelte"
@@ -137,18 +126,18 @@
                       }
                     }}
                     class="col-span-5 rounded-r-none border-r-0"
-                    disabled={$setViewSortMutation.isPending}
+                    disabled={$setViewSortMutation.isPending || readonly}
                   />
 
-                  <SortPicker bind:value={item.direction} class="col-span-3" />
+                  <SortPicker bind:value={item.direction} class="col-span-3" disabled={readonly} />
                 </div>
                 <div class="text-muted-foreground col-span-2 flex justify-end gap-2">
-                  {#if $hasPermission("table:update")}
+                  {#if $hasPermission("table:update") && !readonly}
                     <button disabled={$setViewSortMutation.isPending} on:click={() => removeSort(item.fieldId)}>
                       <Trash2Icon class="h-3 w-3" />
                     </button>
                     <button
-                      disabled={$setViewSortMutation.isPending}
+                      disabled={$setViewSortMutation.isPending || readonly}
                       class=".handler"
                       on:click={() => removeSort(item.fieldId)}
                     >
diff --git a/apps/frontend/src/lib/store/share.store.svelte.ts b/apps/frontend/src/lib/store/share.store.svelte.ts
new file mode 100644
index 000000000..48f378b09
--- /dev/null
+++ b/apps/frontend/src/lib/store/share.store.svelte.ts
@@ -0,0 +1,47 @@
+import type { IShareTarget } from "@undb/share"
+import { MaybeConditionGroup } from "@undb/table"
+import { getContext, setContext } from "svelte"
+import { writable } from "svelte/store"
+
+export interface IShare {
+  enabled: boolean
+  id: string
+  target: IShareTarget
+}
+
+export const createShareStore = () => {
+  const { subscribe, update } = writable<Map<string, IShare>>(new Map())
+
+  return {
+    subscribe,
+    set: (id: string, share: IShare) => update((shares) => shares.set(id, share)),
+  }
+}
+
+export const shareStore = createShareStore()
+
+const shareIdContext = "shareId"
+
+export const setShareId = (shareId: string) => {
+  setContext(shareIdContext, shareId)
+}
+
+export const getShareId = () => {
+  return getContext<string | undefined>(shareIdContext)
+}
+
+export const getIsShare = () => {
+  return !!getShareId()
+}
+
+export const createShareFilterStore = () => {
+  const { subscribe, update, set } = writable<MaybeConditionGroup<any> | undefined>(undefined)
+
+  return {
+    subscribe,
+    set,
+    update,
+  }
+}
+
+export const shareFilterStore = createShareFilterStore()
diff --git a/apps/frontend/src/lib/store/share.store.ts b/apps/frontend/src/lib/store/share.store.ts
deleted file mode 100644
index 7a74e2ca6..000000000
--- a/apps/frontend/src/lib/store/share.store.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { IShareTarget } from "@undb/share"
-import { writable } from "svelte/store"
-
-export interface IShare {
-  enabled: boolean
-  id: string
-  target: IShareTarget
-}
-
-export const createShareStore = () => {
-  const { subscribe, update } = writable<Map<string, IShare>>(new Map())
-
-  return {
-    subscribe,
-    set: (id: string, share: IShare) => update((shares) => shares.set(id, share)),
-  }
-}
-
-export const shareStore = createShareStore()
diff --git a/apps/frontend/src/routes/(authed)/(space)/bases/[baseId]/+layout.svelte b/apps/frontend/src/routes/(authed)/(space)/bases/[baseId]/+layout.svelte
index 3994929ac..e819e94a2 100644
--- a/apps/frontend/src/routes/(authed)/(space)/bases/[baseId]/+layout.svelte
+++ b/apps/frontend/src/routes/(authed)/(space)/bases/[baseId]/+layout.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import BaseHeader from "$lib/components/blocks/base/base-header.svelte"
   import UpdateBaseDialog from "$lib/components/blocks/base/update-base-dialog.svelte"
-  import { shareStore } from "$lib/store/share.store"
+  import { shareStore } from "$lib/store/share.store.svelte"
   import type { LayoutData } from "./$types"
 
   export let data: LayoutData
diff --git a/apps/frontend/src/routes/(authed)/(space)/dashboards/[dashboardId]/+layout.svelte b/apps/frontend/src/routes/(authed)/(space)/dashboards/[dashboardId]/+layout.svelte
index ceb677595..381d648e1 100644
--- a/apps/frontend/src/routes/(authed)/(space)/dashboards/[dashboardId]/+layout.svelte
+++ b/apps/frontend/src/routes/(authed)/(space)/dashboards/[dashboardId]/+layout.svelte
@@ -3,7 +3,7 @@
   import type { LayoutData } from "./$types"
   import { setDashboard } from "$lib/store/dashboard.store"
   import { writable } from "svelte/store"
-  import { shareStore } from "$lib/store/share.store"
+  import { shareStore } from "$lib/store/share.store.svelte"
 
   export let data: LayoutData
 
diff --git a/apps/frontend/src/routes/(authed)/(space)/t/[tableId]/+layout.svelte b/apps/frontend/src/routes/(authed)/(space)/t/[tableId]/+layout.svelte
index 327461c88..aecc9d32c 100644
--- a/apps/frontend/src/routes/(authed)/(space)/t/[tableId]/+layout.svelte
+++ b/apps/frontend/src/routes/(authed)/(space)/t/[tableId]/+layout.svelte
@@ -4,7 +4,7 @@
   import { setTable } from "$lib/store/table.store"
   import type { LayoutData } from "./$types"
   import { writable } from "svelte/store"
-  import { shareStore } from "$lib/store/share.store"
+  import { shareStore } from "$lib/store/share.store.svelte"
   import { aggregatesStore } from "$lib/store/aggregates.store"
 
   export let data: LayoutData
diff --git a/apps/frontend/src/routes/(share)/s/[d]/[shareId]/+layout.svelte b/apps/frontend/src/routes/(share)/s/[d]/[shareId]/+layout.svelte
index e61460755..61f5d3c09 100644
--- a/apps/frontend/src/routes/(share)/s/[d]/[shareId]/+layout.svelte
+++ b/apps/frontend/src/routes/(share)/s/[d]/[shareId]/+layout.svelte
@@ -3,7 +3,7 @@
   import type { LayoutData } from "./$types"
   import { setDashboard } from "$lib/store/dashboard.store"
   import { writable } from "svelte/store"
-  import { shareStore } from "$lib/store/share.store"
+  import { shareStore } from "$lib/store/share.store.svelte"
 
   export let data: LayoutData
 
diff --git a/apps/frontend/src/routes/(share)/s/[d]/[shareId]/+page.svelte b/apps/frontend/src/routes/(share)/s/[d]/[shareId]/+page.svelte
index a82497383..2b4a2cea3 100644
--- a/apps/frontend/src/routes/(share)/s/[d]/[shareId]/+page.svelte
+++ b/apps/frontend/src/routes/(share)/s/[d]/[shareId]/+page.svelte
@@ -3,10 +3,15 @@
   import DashboardWidgets from "$lib/components/blocks/dashboard/dashboard-widgets.svelte"
   import { getDashboard } from "$lib/store/dashboard.store"
   import { GaugeIcon } from "lucide-svelte"
+  import { setShareId } from "$lib/store/share.store.svelte"
 
   const dashboard = getDashboard()
 
   const shareId = $page.params.shareId
+
+  $: if (shareId) {
+    setShareId(shareId)
+  }
 </script>
 
 <div class="flex h-full flex-col">
diff --git a/apps/frontend/src/routes/(share)/s/b/[shareId]/+page.svelte b/apps/frontend/src/routes/(share)/s/b/[shareId]/+page.svelte
index 9cddff7eb..5ff654645 100644
--- a/apps/frontend/src/routes/(share)/s/b/[shareId]/+page.svelte
+++ b/apps/frontend/src/routes/(share)/s/b/[shareId]/+page.svelte
@@ -2,12 +2,17 @@
   import { page } from "$app/stores"
   import BaseDetail from "$lib/components/blocks/base/base-detail.svelte"
   import type { PageData } from "./$types"
+  import { setShareId } from "$lib/store/share.store.svelte"
 
   export let data: PageData
 
   $: getBaseStore = data.getShareBaseStore
   $: base = $getBaseStore.data?.baseByShare
   $: shareId = $page.params.shareId
+
+  $: if (shareId) {
+    setShareId(shareId)
+  }
 </script>
 
 {#if base}
diff --git a/apps/frontend/src/routes/(share)/s/b/[shareId]/t/[tableId]/+layout.svelte b/apps/frontend/src/routes/(share)/s/b/[shareId]/t/[tableId]/+layout.svelte
index 887da36d6..06e5f616c 100644
--- a/apps/frontend/src/routes/(share)/s/b/[shareId]/t/[tableId]/+layout.svelte
+++ b/apps/frontend/src/routes/(share)/s/b/[shareId]/t/[tableId]/+layout.svelte
@@ -3,7 +3,7 @@
   import { setTable } from "$lib/store/table.store"
   import type { LayoutData } from "./$types"
   import { writable } from "svelte/store"
-  import { shareStore } from "$lib/store/share.store"
+  import { shareStore } from "$lib/store/share.store.svelte"
   import { goto } from "$app/navigation"
 
   export let data: LayoutData
diff --git a/apps/frontend/src/routes/(share)/s/b/[shareId]/t/[tableId]/[[viewId]]/+page.svelte b/apps/frontend/src/routes/(share)/s/b/[shareId]/t/[tableId]/[[viewId]]/+page.svelte
index 2123551c7..0cdebc871 100644
--- a/apps/frontend/src/routes/(share)/s/b/[shareId]/t/[tableId]/[[viewId]]/+page.svelte
+++ b/apps/frontend/src/routes/(share)/s/b/[shareId]/t/[tableId]/[[viewId]]/+page.svelte
@@ -10,6 +10,7 @@
   import ShareGalleryView from "$lib/components/blocks/share/share-gallery-view.svelte"
   import ShareKanbanView from "$lib/components/blocks/share/share-kanban-view.svelte"
   import { r } from "$lib/store/records.store"
+  import { setShareId } from "$lib/store/share.store.svelte"
 
   let RecordDetailSheet: ComponentType
 
@@ -19,6 +20,10 @@
     RecordDetailSheet = (await import("$lib/components/blocks/record-detail/share-record-detail-sheet.svelte")).default
   })
 
+  $: if ($shareId) {
+    setShareId($shareId)
+  }
+
   const t = getTable()
 
   $: view = $t.views.getViewById($viewId)
diff --git a/apps/frontend/src/routes/(share)/s/f/[shareId]/+layout.svelte b/apps/frontend/src/routes/(share)/s/f/[shareId]/+layout.svelte
index d8d2801cd..51158db09 100644
--- a/apps/frontend/src/routes/(share)/s/f/[shareId]/+layout.svelte
+++ b/apps/frontend/src/routes/(share)/s/f/[shareId]/+layout.svelte
@@ -3,7 +3,7 @@
   import { setTable } from "$lib/store/table.store"
   import type { LayoutData } from "./$types"
   import { writable } from "svelte/store"
-  import { shareStore } from "$lib/store/share.store"
+  import { shareStore } from "$lib/store/share.store.svelte"
   import Logo from "$lib/images/logo.svg"
 
   export let data: LayoutData
diff --git a/apps/frontend/src/routes/(share)/s/f/[shareId]/+page.svelte b/apps/frontend/src/routes/(share)/s/f/[shareId]/+page.svelte
index eb44da362..60d65e2c0 100644
--- a/apps/frontend/src/routes/(share)/s/f/[shareId]/+page.svelte
+++ b/apps/frontend/src/routes/(share)/s/f/[shareId]/+page.svelte
@@ -8,7 +8,7 @@
   import Button from "$lib/components/ui/button/button.svelte"
   import { getFormBgColor } from "$lib/components/blocks/forms/form-bg-color"
   import FieldControl from "$lib/components/blocks/field-control/field-control.svelte"
-  import { shareStore } from "$lib/store/share.store"
+  import { shareStore } from "$lib/store/share.store.svelte"
   import { page } from "$app/stores"
   import { closeModal, CREATE_RECORD_MODAL } from "$lib/store/modal.store"
   import { trpc } from "$lib/trpc/client"
@@ -55,9 +55,9 @@
 
   const createRecord = (values: any) => {
     const formId = form?.id
-        if (!formId) {
-          return
-        }
+    if (!formId) {
+      return
+    }
     $createRecordMutation.mutate({
       tableId: $table.id.value,
       form: formId,
diff --git a/apps/frontend/src/routes/(share)/s/v/[shareId]/+layout.svelte b/apps/frontend/src/routes/(share)/s/v/[shareId]/+layout.svelte
index 5896dc8e9..3f110b1fa 100644
--- a/apps/frontend/src/routes/(share)/s/v/[shareId]/+layout.svelte
+++ b/apps/frontend/src/routes/(share)/s/v/[shareId]/+layout.svelte
@@ -3,7 +3,7 @@
   import { setTable } from "$lib/store/table.store"
   import type { LayoutData } from "./$types"
   import { derived, writable } from "svelte/store"
-  import { shareStore } from "$lib/store/share.store"
+  import { shareStore } from "$lib/store/share.store.svelte"
   import { aggregatesStore } from "$lib/store/aggregates.store"
   import { createQuery } from "@tanstack/svelte-query"
   import { trpc } from "$lib/trpc/client"
diff --git a/apps/frontend/src/routes/(share)/s/v/[shareId]/+page.svelte b/apps/frontend/src/routes/(share)/s/v/[shareId]/+page.svelte
index d23fb32a4..44d0ea822 100644
--- a/apps/frontend/src/routes/(share)/s/v/[shareId]/+page.svelte
+++ b/apps/frontend/src/routes/(share)/s/v/[shareId]/+page.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import { page } from "$app/stores"
   import ShareViewPage from "$lib/components/blocks/share/share-view-page.svelte"
-  import { shareStore } from "$lib/store/share.store"
+  import { shareStore } from "$lib/store/share.store.svelte"
   import { onMount, type ComponentType } from "svelte"
   import { derived } from "svelte/store"
   import { r } from "$lib/store/records.store"
+  import { setShareId } from "$lib/store/share.store.svelte"
 
   let RecordDetailSheet: ComponentType
 
@@ -16,6 +17,10 @@
     const share = $shareStore.get($page.params.shareId)
     return share?.target.id!
   })
+
+  $: if ($page.params.shareId) {
+    setShareId($page.params.shareId)
+  }
 </script>
 
 <ShareViewPage {viewId} shareId={$page.params.shareId} />
diff --git a/packages/table/src/modules/schema/fields/condition/__snapshots__/condition.util.test.ts.snap b/packages/table/src/modules/schema/fields/condition/__snapshots__/condition.util.test.ts.snap
deleted file mode 100644
index d3c5df92b..000000000
--- a/packages/table/src/modules/schema/fields/condition/__snapshots__/condition.util.test.ts.snap
+++ /dev/null
@@ -1,95 +0,0 @@
-// Bun Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`condition.util should get correct spec 1`] = `
-OptionType {
-  [Symbol(T)]: true,
-  [Symbol(Val)]: And {
-    "left": StringEqual {
-      "fieldId": {
-        "props": {
-          "value": "fld_1",
-        },
-      },
-      "values": StringFieldValue {
-        "props": {
-          "value": "value1",
-        },
-      },
-    },
-    "right": NumberGT {
-      "fieldId": {
-        "props": {
-          "value": "fld_2",
-        },
-      },
-      "value": 1,
-    },
-  },
-}
-`;
-
-exports[`condition.util should get correct spec 2`] = `
-OptionType {
-  [Symbol(T)]: true,
-  [Symbol(Val)]: Or {
-    "left": Or {
-      "left": StringEqual {
-        "fieldId": {
-          "props": {
-            "value": "fld_1",
-          },
-        },
-        "values": StringFieldValue {
-          "props": {
-            "value": "value1",
-          },
-        },
-      },
-      "right": And {
-        "left": StringEqual {
-          "fieldId": {
-            "props": {
-              "value": "fld_1",
-            },
-          },
-          "values": StringFieldValue {
-            "props": {
-              "value": "value1",
-            },
-          },
-        },
-        "right": NumberGT {
-          "fieldId": {
-            "props": {
-              "value": "fld_2",
-            },
-          },
-          "value": 1,
-        },
-      },
-    },
-    "right": Or {
-      "left": StringEqual {
-        "fieldId": {
-          "props": {
-            "value": "fld_1",
-          },
-        },
-        "values": StringFieldValue {
-          "props": {
-            "value": "value2",
-          },
-        },
-      },
-      "right": NumberLT {
-        "fieldId": {
-          "props": {
-            "value": "fld_2",
-          },
-        },
-        "value": 2,
-      },
-    },
-  },
-}
-`;
diff --git a/packages/table/src/modules/schema/fields/condition/condition.util.ts b/packages/table/src/modules/schema/fields/condition/condition.util.ts
index 2c22dd272..e3c8b6e98 100644
--- a/packages/table/src/modules/schema/fields/condition/condition.util.ts
+++ b/packages/table/src/modules/schema/fields/condition/condition.util.ts
@@ -8,7 +8,7 @@ import type {
 import type { Schema } from "../../schema.vo"
 import { FieldIdVo } from "../field-id.vo"
 import type { AbstractField } from "../variants/abstract-field.vo"
-import type { IConditionGroup, IConditionGroupChildren, MaybeConditionGroup } from "./condition.type"
+import type { Conjunction, IConditionGroup, IConditionGroupChildren, MaybeConditionGroup } from "./condition.type"
 import type { IFieldCondition, MaybeFieldCondition, MaybeFieldConditionWithFieldId } from "./field-condition.type"
 
 type Spec = Option<IRecordComositeSpecification | INotRecordComositeSpecification>
@@ -296,3 +296,73 @@ export function mergeConditionGroups<OptionType extends z.ZodTypeAny>(
     children: [a, b],
   }
 }
+
+export function addMaybeCondition(
+  value: MaybeConditionGroup<any> | undefined,
+  condition: MaybeFieldCondition,
+  conjunction: Conjunction = "and",
+) {
+  if (!value) {
+    return {
+      children: [condition],
+      conjunction,
+      id: uid(10),
+      option: {},
+    }
+  }
+
+  return {
+    children: [...value.children, condition],
+    conjunction,
+    id: uid(10),
+    option: {},
+  }
+}
+
+export function addMaybeConditionGroup(
+  value: MaybeConditionGroup<any> | undefined,
+  conditionGroup: MaybeConditionGroup<any>,
+  conjunction: Conjunction = "and",
+) {
+  if (!value) {
+    return {
+      children: [conditionGroup],
+      conjunction,
+      id: uid(10),
+      option: {},
+    }
+  }
+
+  return {
+    children: [...value.children, conditionGroup],
+    conjunction,
+    id: uid(10),
+    option: {},
+  }
+}
+
+export function removeCondition(value: MaybeConditionGroup<any> | undefined, index: number) {
+  if (!value) {
+    return value
+  }
+
+  return {
+    ...value,
+    children: value.children.filter((_, i) => i !== index),
+  }
+}
+
+export function swapCondition(value: MaybeConditionGroup<any> | undefined, oldIndex: number, newIndex: number) {
+  if (!value) {
+    return value
+  }
+
+  const children = [...value.children]
+  const [removed] = children.splice(oldIndex, 1)
+  children.splice(newIndex, 0, removed)
+
+  return {
+    ...value,
+    children,
+  }
+}