diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/date-faceted-filter.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/date-faceted-filter.svelte
index 47758b9ce1..876c05615b 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/date-faceted-filter.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/date-faceted-filter.svelte
@@ -8,7 +8,6 @@
     import { Button } from '$comp/ui/button';
     import * as Popover from '$comp/ui/popover';
     import Separator from '$comp/ui/separator/separator.svelte';
-    import { quickRanges } from '$features/shared/components/date-range-picker/quick-ranges';
 
     import { DateFilter } from './models.svelte';
 
@@ -69,11 +68,9 @@
             </Button>
         {/snippet}
     </Popover.Trigger>
-    <Popover.Content align="start" class="w-auto p-0" side="bottom" onkeydown={handleKeyDown}>
+    <Popover.Content align="start" class="p-0" side="bottom" onkeydown={handleKeyDown}>
         <div id={`${title}-help`} class="sr-only">Press Enter to apply filter, Escape to cancel</div>
-        <div class="flex flex-col">
-            <DateRangePicker bind:this={dateRangePickerRef} {quickRanges} value={filter.value} onselect={handleSelect} />
-        </div>
+        <DateRangePicker bind:this={dateRangePickerRef} value={filter.value} onselect={handleSelect} />
         <FacetedFilter.Actions clear={onClearFilter} hidden={filter.hidden} remove={onRemoveFilter} showClear={filter.value !== undefined} {toggleHidden} />
     </Popover.Content>
 </Popover.Root>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/helpers.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/helpers.svelte.ts
index 3e89d5c08c..dcad9673b4 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/helpers.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/components/filters/helpers.svelte.ts
@@ -22,11 +22,6 @@ import {
     VersionFilter
 } from './models.svelte';
 
-let filterCacheVersion = $state(1);
-export function filterCacheVersionNumber() {
-    return filterCacheVersion;
-}
-
 const filterCache = new SvelteMap<null | string, IFilter[]>();
 
 interface SerializedFilter {
@@ -56,7 +51,6 @@ export function buildFilterCacheKey(organization: string | undefined, scope: str
 
 export function clearFilterCache() {
     filterCache.clear();
-    filterCacheVersion = 1;
 }
 
 export function deserializeFilters(json: string): IFilter[] {
@@ -226,7 +220,6 @@ export function updateFilterCache(cacheKey: string, filters: IFilter[]) {
 
     filterCache.delete(cacheKey);
     filterCache.set(cacheKey, filters);
-    filterCacheVersion += 1;
 }
 
 function processFilterRules(filters: IFilter[]): IFilter[] {
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/date-range-picker/date-range-picker.stories.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/date-range-picker/date-range-picker.stories.ts
index 422f0b60a8..6429b92782 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/date-range-picker/date-range-picker.stories.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/date-range-picker/date-range-picker.stories.ts
@@ -1,12 +1,9 @@
 import type { Meta, StoryObj } from '@storybook/sveltekit';
 
 import DateRangePicker from './date-range-picker.svelte';
-import { quickRanges } from './quick-ranges';
 
 const meta = {
-    args: {
-        quickRanges
-    },
+    args: {},
     argTypes: {},
     component: DateRangePicker,
     parameters: {
@@ -22,21 +19,20 @@ type Story = StoryObj<typeof meta>;
 
 export const DefaultQuickRanges: Story = {
     args: {
-        value: 'last 24 hours'
+        value: '[now-1d TO now]'
     }
 };
 
-export const CustomQuickRanges: Story = {
+export const CustomRange: Story = {
     args: {
-        quickRanges,
-        value: 'previous week'
+        value: '[2025-01-01T00:00:00 TO 2025-01-02T00:00:00]'
     },
     name: 'Custom Range'
 };
 
 export const WithSelectedRange: Story = {
     args: {
-        value: '[now-1d TO now]'
+        value: '[now-7d TO now]'
     }
 };
 
@@ -47,7 +43,7 @@ export const ShowingCustomForm: Story = {
     parameters: {
         docs: {
             description: {
-                story: 'This story demonstrates the calendar time picker with a selected quick range. Switch to the Custom tab to edit a custom range.'
+                story: 'This story demonstrates the date range picker with a selected quick range. Expand the Custom range section to edit a custom range.'
             }
         }
     }
@@ -55,14 +51,13 @@ export const ShowingCustomForm: Story = {
 
 export const AutoSelectCustomTab: Story = {
     args: {
-        // A value unlikely to match a predefined quick range forces the custom tab active
-        value: '2025-01-01T00:00:00 TO 2025-01-02T00:00:00'
+        value: '[2025-01-01T00:00:00 TO 2025-01-02T00:00:00]'
     },
-    name: 'Auto Selects Custom Tab (non quick value)',
+    name: 'Auto Expands Custom Section (non quick value)',
     parameters: {
         docs: {
             description: {
-                story: 'When the current value does not match any quick range option, the Custom tab is automatically selected.'
+                story: 'When the current value does not match any common range option, the Custom range section is automatically expanded.'
             }
         }
     }
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/date-range-picker/date-range-picker.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/date-range-picker/date-range-picker.svelte
index a5ae5fd3c3..0ff5f89763 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/date-range-picker/date-range-picker.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/date-range-picker/date-range-picker.svelte
@@ -1,82 +1,144 @@
 <script lang="ts">
     import type { CustomDateRange } from '$features/shared/models';
 
-    import * as Tabs from '$comp/ui/tabs';
-    import { extractRangeExpressions } from '$features/shared/utils/datemath';
-
-    import CustomRangeForm from './custom-range-form.svelte';
-    import QuickRangeSelector from './quick-range-selector.svelte';
-    import { quickRanges as defaultQuickRanges, type QuickRangeSection } from './quick-ranges';
+    import DateTime from '$comp/formatters/date-time.svelte';
+    import { Button } from '$comp/ui/button';
+    import { Input } from '$comp/ui/input';
+    import { extractRangeExpressions, validateAndResolveTime, validateDateMath } from '$features/shared/utils/datemath';
+    import Check from '@lucide/svelte/icons/check';
+    import ChevronRight from '@lucide/svelte/icons/chevron-right';
 
     type Props = {
         cancel?: () => void;
         class?: string;
         onselect?: (value: string) => void;
-        quickRanges?: QuickRangeSection[];
         value?: Date | string;
     };
 
-    let { cancel, class: className, onselect, quickRanges = defaultQuickRanges, value = $bindable() }: Props = $props();
+    let { cancel, class: className, onselect, value = $bindable() }: Props = $props();
 
-    let activeTab = $state<'custom' | 'quick'>('quick');
-    let customFormRef: CustomRangeForm | undefined = $state();
+    // Simplified quick ranges — just the most commonly used
+    const commonRanges = [
+        { label: 'Last 15 minutes', value: '[now-15m TO now]' },
+        { label: 'Last 1 hour', value: '[now-1h TO now]' },
+        { label: 'Last 4 hours', value: '[now-4h TO now]' },
+        { label: 'Last 24 hours', value: '[now-1d TO now]' },
+        { label: 'Last 7 days', value: '[now-7d TO now]' },
+        { label: 'Last 30 days', value: '[now-30d TO now]' },
+        { label: 'Last 90 days', value: '[now-90d TO now]' }
+    ];
 
-    const parsedCustomRange = $derived(() => {
-        if (!value) {
-            return null;
-        }
+    let showCustom = $state(false);
+    let startValue = $state('');
+    let endValue = $state('');
 
-        return extractRangeExpressions(value) as CustomDateRange | null;
-    });
-
-    const quickRangeMatch = $derived(() => {
-        if (!value) {
-            return null;
-        }
-
-        for (const section of quickRanges) {
-            for (const option of section.options) {
-                if (option.value === value) {
-                    return option;
-                }
+    // Initialize custom fields from current value if it's not a common range
+    $effect(() => {
+        const isCommon = commonRanges.some((r) => r.value === value);
+        if (!isCommon && value && typeof value === 'string') {
+            const range = extractRangeExpressions(value) as CustomDateRange | null;
+            if (range) {
+                startValue = range.start ?? '';
+                endValue = range.end ?? '';
+                showCustom = true;
             }
         }
-
-        return null;
     });
 
-    // Auto switch tab based on current value
-    $effect(() => {
-        if (quickRangeMatch()) {
-            activeTab = 'quick';
-        } else if (value) {
-            activeTab = 'custom';
+    const startValidation = $derived(validateDateMath(startValue));
+    const startResolved = $derived(startValidation.valid ? validateAndResolveTime(startValue) : null);
+    const endValidation = $derived(validateDateMath(endValue));
+    const endResolved = $derived(endValidation.valid ? validateAndResolveTime(endValue) : null);
+    const isCustomValid = $derived(startValidation.valid && endValidation.valid && !!startValue && !!endValue);
+
+    function selectRange(rangeValue: string) {
+        value = rangeValue;
+        onselect?.(rangeValue);
+    }
+
+    function applyCustom() {
+        if (isCustomValid) {
+            const customValue = `[${startValue} TO ${endValue}]`;
+            value = customValue;
+            onselect?.(customValue);
         }
-    });
+    }
 
-    function handleCustomApply(range: CustomDateRange) {
-        if (range.start && range.end) {
-            value = `[${range.start} TO ${range.end}]`;
-            onselect?.(value);
+    function handleKeyDown(event: KeyboardEvent) {
+        if (event.key === 'Enter' && isCustomValid) {
+            event.preventDefault();
+            applyCustom();
+        } else if (event.key === 'Escape') {
+            event.preventDefault();
+            cancel?.();
         }
     }
 
     export function apply() {
-        customFormRef?.submitIfValid();
+        if (showCustom && isCustomValid) {
+            applyCustom();
+        }
     }
 </script>
 
-<div class={['w-[420px] p-4', className]}>
-    <Tabs.Root value={activeTab}>
-        <Tabs.List>
-            <Tabs.Trigger value="quick">Quick Range</Tabs.Trigger>
-            <Tabs.Trigger value="custom">Custom</Tabs.Trigger>
-        </Tabs.List>
-        <Tabs.Content value="quick">
-            <QuickRangeSelector {quickRanges} bind:value {onselect} />
-        </Tabs.Content>
-        <Tabs.Content value="custom">
-            <CustomRangeForm bind:this={customFormRef} range={parsedCustomRange()} {cancel} apply={handleCustomApply} />
-        </Tabs.Content>
-    </Tabs.Root>
+<div class={className}>
+    <div class="flex flex-col p-1">
+        {#each commonRanges as range (range.value)}
+            <button
+                type="button"
+                class="hover:bg-muted hover:text-foreground flex items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden transition-colors select-none"
+                onclick={() => selectRange(range.value)}
+            >
+                <span class="size-4 shrink-0">
+                    {#if range.value === value}
+                        <Check class="text-primary size-4" />
+                    {/if}
+                </span>
+                <span class={range.value === value ? 'font-medium' : ''}>{range.label}</span>
+            </button>
+        {/each}
+
+        <button
+            type="button"
+            class="hover:bg-muted hover:text-foreground flex items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden transition-colors select-none"
+            onclick={() => (showCustom = !showCustom)}
+        >
+            <ChevronRight class={['text-muted-foreground size-4 shrink-0 transition-transform', showCustom && 'rotate-90']} />
+            <span class={showCustom ? 'font-medium' : ''}>Custom range</span>
+        </button>
+
+        {#if showCustom}
+            <div class="space-y-2 px-2 pt-2 pb-1">
+                <div>
+                    <Input
+                        placeholder="Start: now-1h, 2024-01-01"
+                        class="h-7 font-mono text-xs"
+                        bind:value={startValue}
+                        aria-invalid={startValue ? !startValidation.valid : undefined}
+                        onkeydown={handleKeyDown}
+                    />
+                    {#if startValue && startValidation.valid && startResolved}
+                        <p class="text-muted-foreground mt-0.5 text-[11px]"><DateTime value={startResolved} /></p>
+                    {:else if startValue && !startValidation.valid}
+                        <p class="text-destructive mt-0.5 text-[11px]">{startValidation.error}</p>
+                    {/if}
+                </div>
+                <div>
+                    <Input
+                        placeholder="End: now, 2024-12-31"
+                        class="h-7 font-mono text-xs"
+                        bind:value={endValue}
+                        aria-invalid={endValue ? !endValidation.valid : undefined}
+                        onkeydown={handleKeyDown}
+                    />
+                    {#if endValue && endValidation.valid && endResolved}
+                        <p class="text-muted-foreground mt-0.5 text-[11px]"><DateTime value={endResolved} /></p>
+                    {:else if endValue && !endValidation.valid}
+                        <p class="text-destructive mt-0.5 text-[11px]">{endValidation.error}</p>
+                    {/if}
+                </div>
+                <Button size="sm" class="w-full" disabled={!isCustomValid} onclick={applyCustom}>Apply</Button>
+            </div>
+        {/if}
+    </div>
 </div>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-actions.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-actions.svelte
index 6ab6c1d13e..616baf08d7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-actions.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-actions.svelte
@@ -1,6 +1,10 @@
 <script lang="ts">
     import { Button } from '$comp/ui/button';
-    import Separator from '$comp/ui/separator/separator.svelte';
+    import * as Tooltip from '$comp/ui/tooltip';
+    import Eraser from '@lucide/svelte/icons/eraser';
+    import Eye from '@lucide/svelte/icons/eye';
+    import EyeOff from '@lucide/svelte/icons/eye-off';
+    import Trash2 from '@lucide/svelte/icons/trash-2';
 
     interface Props {
         clear: () => void;
@@ -13,13 +17,43 @@
     let { clear, hidden = false, remove, showClear, toggleHidden }: Props = $props();
 </script>
 
-<div class="flex flex-col">
-    <Separator />
+<div class="flex items-center justify-end gap-0.5 border-t px-2 py-1">
     {#if showClear}
-        <Button variant="ghost" onclick={clear}>Clear Filter</Button>
+        <Tooltip.Root>
+            <Tooltip.Trigger>
+                {#snippet child({ props })}
+                    <Button {...props} variant="ghost" size="icon-sm" onclick={clear}>
+                        <Eraser class="text-muted-foreground size-3.5" />
+                    </Button>
+                {/snippet}
+            </Tooltip.Trigger>
+            <Tooltip.Content>Clear value</Tooltip.Content>
+        </Tooltip.Root>
     {/if}
     {#if toggleHidden}
-        <Button variant="ghost" onclick={toggleHidden}>{hidden ? 'Show Filter' : 'Hide Filter'}</Button>
+        <Tooltip.Root>
+            <Tooltip.Trigger>
+                {#snippet child({ props })}
+                    <Button {...props} variant="ghost" size="icon-sm" onclick={toggleHidden}>
+                        {#if hidden}
+                            <Eye class="text-muted-foreground size-3.5" />
+                        {:else}
+                            <EyeOff class="text-muted-foreground size-3.5" />
+                        {/if}
+                    </Button>
+                {/snippet}
+            </Tooltip.Trigger>
+            <Tooltip.Content>{hidden ? 'Show filter' : 'Hide filter'}</Tooltip.Content>
+        </Tooltip.Root>
     {/if}
-    <Button variant="ghost" onclick={remove}>Remove Filter</Button>
+    <Tooltip.Root>
+        <Tooltip.Trigger>
+            {#snippet child({ props })}
+                <Button {...props} variant="ghost" size="icon-sm" onclick={remove}>
+                    <Trash2 class="text-muted-foreground size-3.5" />
+                </Button>
+            {/snippet}
+        </Tooltip.Trigger>
+        <Tooltip.Content>Remove filter</Tooltip.Content>
+    </Tooltip.Root>
 </div>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-boolean.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-boolean.svelte
index bddf3a452a..3fc7897a48 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-boolean.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-boolean.svelte
@@ -36,6 +36,8 @@
         } else if (selectedValue === 'no-value') {
             updatedValue = undefined;
         }
+
+        changed(updatedValue);
     }
 
     function handleKeyDown(event: KeyboardEvent) {
@@ -49,21 +51,18 @@
     }
 
     function applyAndClose() {
-        if (updatedValue !== value) {
-            changed(updatedValue);
-        }
-
         open = false;
     }
 
     function cancelAndClose() {
         updatedValue = value;
+        changed(updatedValue);
         open = false;
     }
 
     function onOpenChange(isOpen: boolean) {
         if (!isOpen) {
-            applyAndClose();
+            open = false;
         }
     }
 
@@ -91,7 +90,7 @@
             </Button>
         {/snippet}
     </Popover.Trigger>
-    <Popover.Content align="start" class="p-0" side="bottom" trapFocus={false} {onEscapeKeydown} onFocusOutside={applyAndClose}>
+    <Popover.Content align="start" class="p-0" side="bottom" trapFocus={false} {onEscapeKeydown} onFocusOutside={(e) => e.preventDefault()}>
         <div class="border-b p-4">
             <RadioGroup.Root
                 value={radioValue}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte
index ec2bf1766e..114334072b 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-builder.svelte
@@ -6,8 +6,11 @@
     import { Button } from '$comp/ui/button';
     import * as Command from '$comp/ui/command';
     import * as Popover from '$comp/ui/popover';
-    import Separator from '$comp/ui/separator/separator.svelte';
+    import * as Tooltip from '$comp/ui/tooltip';
     import Circle from '@lucide/svelte/icons/circle-plus';
+    import Eraser from '@lucide/svelte/icons/eraser';
+    import Eye from '@lucide/svelte/icons/eye';
+    import EyeOff from '@lucide/svelte/icons/eye-off';
     import { computeCommandScore } from 'bits-ui';
 
     import type { FacetedFilter, IFilter } from './models';
@@ -31,12 +34,15 @@
 
     // Clear the builder context because multiple builders will be loaded during page navigation.
     builderContext.clear();
-    let facets: FacetedFilter<IFilter>[] = $derived.by(() => {
+    let facets: FacetedFilter<IFilter>[] = $state([]);
+
+    $effect.pre(() => {
         if (builderContext.size === 0) {
-            return [];
+            facets = [];
+            return;
         }
 
-        return filters
+        const newFacets = filters
             .map((filter) => {
                 const builder = builderContext.get(filter.key);
                 if (!builder) {
@@ -44,6 +50,15 @@
                 }
 
                 const f = builder.create(filter);
+                // Reuse existing facet to preserve open state and avoid component recreation
+                const existing = facets.find((facet) => facet.filter.id === f.id);
+                if (existing) {
+                    existing.filter = f;
+                    existing.component = builder.component;
+                    existing.title = builder.title;
+                    return existing;
+                }
+
                 return {
                     component: builder.component,
                     filter: f,
@@ -52,6 +67,12 @@
                 };
             })
             .filter((f): f is FacetedFilter<IFilter> => !!f);
+
+        // Only replace the array if the set of facets actually changed
+        const idsMatch = newFacets.length === facets.length && newFacets.every((f, i) => f.filter.id === facets[i]?.filter.id);
+        if (!idsMatch) {
+            facets = newFacets;
+        }
     });
 
     const hiddenFilterCount = $derived(filters.filter((filter) => filter.hidden).length);
@@ -82,10 +103,6 @@
     }
 
     function filterChanged(filter: IFilter) {
-        if (lastOpenFilterId === filter.id) {
-            lastOpenFilterId = undefined;
-        }
-
         changed(filter);
     }
 
@@ -228,15 +245,34 @@
                 {/if}
             </Command.List>
         </Command.Root>
-        <div class="flex flex-col">
-            <Separator />
+        <div class="flex items-center justify-end gap-0.5 border-t px-2 py-1">
             {#if hiddenFilterCount > 0}
-                <Button variant="ghost" onclick={toggleHiddenFilters}>
-                    {showHiddenFilters ? 'Hide Hidden Filters' : `Show ${hiddenFilterLabel}`}
-                </Button>
+                <Tooltip.Root>
+                    <Tooltip.Trigger>
+                        {#snippet child({ props })}
+                            <Button {...props} variant="ghost" size="icon-sm" onclick={toggleHiddenFilters}>
+                                {#if showHiddenFilters}
+                                    <EyeOff class="text-muted-foreground size-3.5" />
+                                {:else}
+                                    <Eye class="text-muted-foreground size-3.5" />
+                                {/if}
+                            </Button>
+                        {/snippet}
+                    </Tooltip.Trigger>
+                    <Tooltip.Content>Toggle hidden filters</Tooltip.Content>
+                </Tooltip.Root>
             {/if}
             {#if filters.some((f) => f.type !== 'date')}
-                <Button variant="ghost" onclick={onRemoveAll}>Clear Filters</Button>
+                <Tooltip.Root>
+                    <Tooltip.Trigger>
+                        {#snippet child({ props })}
+                            <Button {...props} variant="ghost" size="icon-sm" onclick={onRemoveAll}>
+                                <Eraser class="text-muted-foreground size-3.5" />
+                            </Button>
+                        {/snippet}
+                    </Tooltip.Trigger>
+                    <Tooltip.Content>Clear all filters</Tooltip.Content>
+                </Tooltip.Root>
             {/if}
         </div>
     </Popover.Content>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-drop-down.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-drop-down.svelte
index 0c09b5a08c..be4fecad20 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-drop-down.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-drop-down.svelte
@@ -46,22 +46,15 @@
         updatedValue = value;
     });
 
-    function applyAndClose() {
-        if (updatedValue !== value) {
-            changed(updatedValue);
-        }
-
-        open = false;
-    }
-
     function cancelAndClose() {
         updatedValue = value;
+        changed(updatedValue);
         open = false;
     }
 
     function onOpenChange(isOpen: boolean) {
         if (!isOpen) {
-            applyAndClose();
+            open = false;
         }
     }
 
@@ -76,10 +69,13 @@
         } else {
             updatedValue = currentValue;
         }
+
+        changed(updatedValue);
     }
 
     export function onClearFilter() {
         updatedValue = undefined;
+        changed(updatedValue);
     }
 
     function displayValue(value: string | undefined) {
@@ -116,7 +112,7 @@
             </Button>
         {/snippet}
     </Popover.Trigger>
-    <Popover.Content align="start" class="p-0" side="bottom" trapFocus={false} {onEscapeKeydown} onFocusOutside={applyAndClose}>
+    <Popover.Content align="start" class="p-0" side="bottom" trapFocus={false} {onEscapeKeydown} onFocusOutside={(e) => e.preventDefault()}>
         <Command.Root {filter}>
             <Command.Input placeholder={title} autofocus={open} aria-describedby={`${title}-help`} />
             <Command.List>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-keyword.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-keyword.svelte
index cca862faa1..4b875c97a7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-keyword.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-keyword.svelte
@@ -77,8 +77,8 @@
             </Button>
         {/snippet}
     </Popover.Trigger>
-    <Popover.Content align="start" class="p-0" side="bottom" trapFocus={false} {onEscapeKeydown} onFocusOutside={applyAndClose}>
-        <div class="flex items-center border-b">
+    <Popover.Content align="start" class="p-0" side="bottom" trapFocus={false} {onEscapeKeydown} onFocusOutside={(e) => e.preventDefault()}>
+        <div class="p-2">
             <Input
                 bind:value={updatedValue}
                 placeholder={title}
@@ -87,6 +87,8 @@
                 aria-describedby={`${title}-help`}
                 onkeydown={handleKeyDown}
                 autofocus={open}
+                spellcheck="false"
+                autocomplete="off"
             />
         </div>
         <div id={`${title}-help`} class="sr-only">Type keywords. Enter applies, Escape cancels.</div>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-multi-select.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-multi-select.svelte
index 9cae79e333..83dacc93e3 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-multi-select.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-multi-select.svelte
@@ -51,24 +51,15 @@
         updatedValues = values;
     });
 
-    const hasChanged = $derived(updatedValues.length !== values.length || updatedValues.some((value) => !values.includes(value)));
-
-    function applyAndClose() {
-        if (hasChanged) {
-            changed(updatedValues);
-        }
-
-        open = false;
-    }
-
     function cancelAndClose() {
         updatedValues = values;
+        changed(updatedValues);
         open = false;
     }
 
     function onOpenChange(isOpen: boolean) {
         if (!isOpen) {
-            applyAndClose();
+            open = false;
         }
     }
 
@@ -79,10 +70,12 @@
 
     export function onValueSelected(currentValue: string) {
         updatedValues = updatedValues.includes(currentValue) ? updatedValues.filter((v) => v !== currentValue) : [...updatedValues, currentValue];
+        changed(updatedValues);
     }
 
     export function onClearFilter() {
         updatedValues = [];
+        changed(updatedValues);
     }
 
     function filter(value: string, search: string) {
@@ -119,7 +112,7 @@
             </Button>
         {/snippet}
     </Popover.Trigger>
-    <Popover.Content align="start" class="p-0" side="bottom" trapFocus={false} {onEscapeKeydown} onFocusOutside={applyAndClose}>
+    <Popover.Content align="start" class="p-0" side="bottom" trapFocus={false} {onEscapeKeydown} onFocusOutside={(e) => e.preventDefault()}>
         <Command.Root {filter}>
             <Command.Input placeholder={title} autofocus={open} aria-describedby={`${title}-help`} />
             <Command.List>
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-number.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-number.svelte
index 1ccc54eb33..e249c879ff 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-number.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-number.svelte
@@ -77,8 +77,8 @@
             </Button>
         {/snippet}
     </Popover.Trigger>
-    <Popover.Content align="start" class="p-0" side="bottom" trapFocus={false} {onEscapeKeydown} onFocusOutside={applyAndClose}>
-        <div class="flex items-center border-b">
+    <Popover.Content align="start" class="p-0" side="bottom" trapFocus={false} {onEscapeKeydown} onFocusOutside={(e) => e.preventDefault()}>
+        <div class="p-2">
             <Input
                 bind:value={updatedValue}
                 placeholder={title}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-string.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-string.svelte
index 47c31fbf54..285a5ba588 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-string.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/faceted-filter/faceted-filter-string.svelte
@@ -77,8 +77,8 @@
             </Button>
         {/snippet}
     </Popover.Trigger>
-    <Popover.Content align="start" class="p-0" side="bottom" trapFocus={false} {onEscapeKeydown} onFocusOutside={applyAndClose}>
-        <div class="flex items-center border-b">
+    <Popover.Content align="start" class="p-0" side="bottom" trapFocus={false} {onEscapeKeydown} onFocusOutside={(e) => e.preventDefault()}>
+        <div class="p-2">
             <Input
                 bind:value={updatedValue}
                 placeholder={title}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar-header.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar-header.svelte
index b54754acbc..a3b99be00e 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar-header.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/components/ui/sidebar/sidebar-header.svelte
@@ -14,7 +14,7 @@
 	bind:this={ref}
 	data-slot="sidebar-header"
 	data-sidebar="header"
-	class={cn("gap-2 p-2 flex flex-col", className)}
+	class={cn("gap-2 px-2 py-1 flex flex-col", className)}
 	{...restProps}
 >
 	{@render children?.()}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar.svelte
index 6523513bb6..36affbaa02 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/(components)/layouts/sidebar.svelte
@@ -220,7 +220,7 @@
         {/if}
     </Sidebar.Header>
     <Sidebar.Content>
-        <Sidebar.Group class="pt-1">
+        <Sidebar.Group class="pt-0">
             <Sidebar.Menu>
                 {#each dashboardRoutes as route (route.href)}
                     {@const Icon = route.icon}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
index 6e62935177..ea5021782d 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte
@@ -435,7 +435,6 @@
     <Sidebar routes={filteredRoutes}>
         {#snippet header()}
             <SidebarOrganizationSwitcher
-                class="pt-2"
                 isLoading={organizationsQuery.isLoading}
                 {organizations}
                 {impersonatedOrganization}
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/events/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/events/+page.svelte
index d4e33def0c..962b40cc2d 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/events/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/events/+page.svelte
@@ -18,7 +18,6 @@
         applyTimeFilter,
         buildFilterCacheKey,
         deserializeFilters,
-        filterCacheVersionNumber,
         filterChanged,
         filterRemoved,
         getFiltersFromCache,
@@ -78,24 +77,24 @@
     }
 
     function getQueryTime(): null | string {
-        if (page.url.searchParams.has('time')) {
-            return page.url.searchParams.get('time') === '' ? null : queryParams.time;
+        if (queryParams.time != null) {
+            return queryParams.time || null;
         }
 
         return savedViewsState.activeSavedView?.time ?? DEFAULT_TIME_RANGE;
     }
 
     function getEffectiveFilter(): null | string {
-        if (page.url.searchParams.has('filter')) {
-            return queryParams.filter ?? '';
+        if (queryParams.filter != null) {
+            return queryParams.filter;
         }
 
         return savedViewsState.activeSavedView?.filter ?? DEFAULT_FILTER;
     }
 
     function getEffectiveSort(): null | string | undefined {
-        if (page.url.searchParams.has('sort')) {
-            return queryParams.sort;
+        if (queryParams.sort != null) {
+            return queryParams.sort || undefined;
         }
 
         return savedViewsState.activeSavedView?.sort ?? undefined;
@@ -156,7 +155,7 @@
     function getCurrentFilters(): FacetedFilter.IFilter[] {
         const filter = getEffectiveFilter();
         const savedView = savedViewsState.activeSavedView;
-        if (!page.url.searchParams.has('filter') && savedView?.filter_definitions && filter === (savedView.filter ?? null)) {
+        if (queryParams.filter == null && savedView?.filter_definitions && filter === (savedView.filter ?? null)) {
             const hydrated = deserializeFilters(savedView.filter_definitions);
             return applyTimeFilter(hydrated, getQueryTime());
         }
@@ -166,7 +165,7 @@
 
     let filters = $state(getCurrentFilters());
     watch(
-        [() => page.url.pathname, () => page.url.search, () => savedViewsState.activeSavedView, () => filterCacheVersionNumber()],
+        [() => page.url.pathname, () => page.url.search, () => savedViewsState.activeSavedView],
         () => {
             filters = getCurrentFilters();
         },
@@ -179,12 +178,20 @@
     });
 
     function onFilterChanged(addedOrUpdated: FacetedFilter.IFilter): void {
-        updateFilters(filterChanged(filters ?? [], addedOrUpdated));
+        const isNew = !filters?.some((f) => f.id === addedOrUpdated.id);
+        const updatedFilters = filterChanged(filters ?? [], addedOrUpdated);
+        updateFilters(updatedFilters);
+        if (isNew) {
+            filters = updatedFilters;
+        }
+
         selectedEventId = null;
     }
 
     function onFilterRemoved(removed?: FacetedFilter.IFilter): void {
-        updateFilters(filterRemoved(filters ?? [], removed));
+        const updatedFilters = filterRemoved(filters ?? [], removed);
+        updateFilters(updatedFilters);
+        filters = updatedFilters;
     }
 
     function updateFilters(updatedFilters: FacetedFilter.IFilter[]): void {
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/issues/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/issues/+page.svelte
index 103e4d9758..17929fe1ab 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/issues/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/issues/+page.svelte
@@ -16,7 +16,6 @@
         applyTimeFilter,
         buildFilterCacheKey,
         deserializeFilters,
-        filterCacheVersionNumber,
         filterChanged,
         filterRemoved,
         getFiltersFromCache,
@@ -82,16 +81,16 @@
     }
 
     function getQueryTime(): null | string {
-        if (page.url.searchParams.has('time')) {
-            return page.url.searchParams.get('time') === '' ? null : queryParams.time;
+        if (queryParams.time != null) {
+            return queryParams.time || null;
         }
 
         return savedViewsState.activeSavedView?.time ?? DEFAULT_TIME_RANGE;
     }
 
     function getEffectiveFilter(): null | string {
-        if (page.url.searchParams.has('filter')) {
-            return queryParams.filter ?? '';
+        if (queryParams.filter != null) {
+            return queryParams.filter;
         }
 
         return savedViewsState.activeSavedView?.filter ?? DEFAULT_FILTER;
@@ -148,7 +147,7 @@
     function getCurrentFilters(): FacetedFilter.IFilter[] {
         const filter = getEffectiveFilter();
         const savedView = savedViewsState.activeSavedView;
-        if (!page.url.searchParams.has('filter') && savedView?.filter_definitions && filter === (savedView.filter ?? null)) {
+        if (queryParams.filter == null && savedView?.filter_definitions && filter === (savedView.filter ?? null)) {
             const hydrated = deserializeFilters(savedView.filter_definitions);
             return applyTimeFilter(hydrated, getQueryTime());
         }
@@ -158,7 +157,7 @@
 
     let filters = $state(getCurrentFilters());
     watch(
-        [() => page.url.pathname, () => page.url.search, () => savedViewsState.activeSavedView, () => filterCacheVersionNumber()],
+        [() => page.url.pathname, () => page.url.search, () => savedViewsState.activeSavedView],
         () => {
             filters = getCurrentFilters();
         },
@@ -178,12 +177,22 @@
         }
 
         // For all other filters, apply them to the current page
-        updateFilters(filterChanged(filters ?? [], addedOrUpdated));
+        const isNew = !filters?.some((f) => f.id === addedOrUpdated.id);
+        const updatedFilters = filterChanged(filters ?? [], addedOrUpdated);
+        updateFilters(updatedFilters);
+        // Only reassign filters for newly added filters to avoid re-rendering open popovers.
+        // Existing filter values are already mutated in place via $state.
+        if (isNew) {
+            filters = updatedFilters;
+        }
+
         selectedStackId = undefined;
     }
 
     function onFilterRemoved(removed?: FacetedFilter.IFilter): void {
-        updateFilters(filterRemoved(filters ?? [], removed));
+        const updatedFilters = filterRemoved(filters ?? [], removed);
+        updateFilters(updatedFilters);
+        filters = updatedFilters;
     }
 
     function updateFilters(updatedFilters: FacetedFilter.IFilter[]): void {
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/issues/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/issues/+page.svelte
index 86ac0fd48b..cacff1be07 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/issues/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/project/[projectId]/issues/+page.svelte
@@ -11,7 +11,6 @@
     import { StatusFilter, StringFilter, TagFilter } from '$features/events/components/filters';
     import {
         buildFilterCacheKey,
-        filterCacheVersionNumber,
         filterChanged,
         filterRemoved,
         getFiltersFromCache,
@@ -115,7 +114,7 @@
 
     let filters = $state(sanitizeStackFilters(getFiltersFromCache(filterCacheKey(queryParams.filter), queryParams.filter)));
     watch(
-        [() => queryParams.filter, () => filterCacheVersionNumber()],
+        [() => queryParams.filter],
         ([filter]) => {
             filters = sanitizeStackFilters(getFiltersFromCache(filterCacheKey(filter), filter), true);
         },
@@ -134,16 +133,24 @@
             return;
         }
 
-        updateFilters(filterChanged(filters ?? [], addedOrUpdated));
+        const isNew = !filters?.some((f) => f.id === addedOrUpdated.id);
+        const updatedFilters = filterChanged(filters ?? [], addedOrUpdated);
+        updateFilters(updatedFilters);
+        if (isNew) {
+            filters = sanitizeStackFilters(updatedFilters);
+        }
     }
 
     function onFilterRemoved(removed?: FacetedFilter.IFilter): void {
         if (!removed) {
             updateFilters([]);
+            filters = [];
             return;
         }
 
-        updateFilters(filterRemoved(filters ?? [], removed));
+        const updatedFilters = filterRemoved(filters ?? [], removed);
+        updateFilters(updatedFilters);
+        filters = updatedFilters;
     }
 
     function updateFilters(updatedFilters: FacetedFilter.IFilter[]): void {
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/sessions/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/sessions/+page.svelte
index adaf4b1380..1e9ca8ffd0 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/sessions/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/sessions/+page.svelte
@@ -18,7 +18,6 @@
     import {
         applyTimeFilter,
         buildFilterCacheKey,
-        filterCacheVersionNumber,
         filterChanged,
         filterRemoved,
         getFiltersFromCache,
@@ -107,7 +106,7 @@
 
     let filters = $state(applyTimeFilter(getFiltersFromCache(filterCacheKey(queryParams.filter), queryParams.filter), queryParams.time));
     watch(
-        [() => queryParams.filter, () => queryParams.time, () => filterCacheVersionNumber()],
+        [() => queryParams.filter, () => queryParams.time],
         ([filter, time]) => {
             filters = applyTimeFilter(getFiltersFromCache(filterCacheKey(filter), filter), time);
         },
@@ -119,12 +118,20 @@
     });
 
     function onFilterChanged(addedOrUpdated: FacetedFilter.IFilter): void {
-        updateFilters(filterChanged(filters ?? [], addedOrUpdated));
+        const isNew = !filters?.some((f) => f.id === addedOrUpdated.id);
+        const updatedFilters = filterChanged(filters ?? [], addedOrUpdated);
+        updateFilters(updatedFilters);
+        if (isNew) {
+            filters = updatedFilters;
+        }
+
         selectedEventId = null;
     }
 
     function onFilterRemoved(removed?: FacetedFilter.IFilter): void {
-        updateFilters(filterRemoved(filters ?? [], removed));
+        const updatedFilters = filterRemoved(filters ?? [], removed);
+        updateFilters(updatedFilters);
+        filters = updatedFilters;
     }
 
     function updateFilters(updatedFilters: FacetedFilter.IFilter[]): void {
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/stream/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/stream/+page.svelte
index 4b5fd6d1bd..dd8b24bbfd 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/stream/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/stream/+page.svelte
@@ -15,7 +15,6 @@
     import { ProjectFilter, StatusFilter } from '$features/events/components/filters';
     import {
         buildFilterCacheKey,
-        filterCacheVersionNumber,
         filterChanged,
         filterRemoved,
         getFiltersFromCache,
@@ -106,7 +105,7 @@
 
     let filters = $state(getFiltersFromCache(filterCacheKey(queryParams.filter), queryParams.filter));
     watch(
-        [() => queryParams.filter, () => filterCacheVersionNumber()],
+        [() => queryParams.filter],
         ([filter]) => {
             filters = getFiltersFromCache(filterCacheKey(filter), filter);
         },
@@ -122,14 +121,21 @@
 
         // For all other filters (skipping date filters), apply them to the current page
         if (addedOrUpdated.type !== 'date') {
-            updateFilters(filterChanged(filters ?? [], addedOrUpdated));
+            const isNew = !filters?.some((f) => f.id === addedOrUpdated.id);
+            const updatedFilters = filterChanged(filters ?? [], addedOrUpdated);
+            updateFilters(updatedFilters);
+            if (isNew) {
+                filters = updatedFilters;
+            }
         }
 
         selectedEventId = null;
     }
 
     function onFilterRemoved(removed?: FacetedFilter.IFilter): void {
-        updateFilters(filterRemoved(filters ?? [], removed));
+        const updatedFilters = filterRemoved(filters ?? [], removed);
+        updateFilters(updatedFilters);
+        filters = updatedFilters;
     }
 
     function updateFilters(updatedFilters: FacetedFilter.IFilter[]): void {