diff --git a/src/lib/components/schedule/schedule-advanced-settings.svelte b/src/lib/components/schedule/schedule-advanced-settings.svelte
index 6f448f488..a03a70c55 100644
--- a/src/lib/components/schedule/schedule-advanced-settings.svelte
+++ b/src/lib/components/schedule/schedule-advanced-settings.svelte
@@ -14,28 +14,47 @@
 
 <ScheduleNotes {notes} />
 <Accordion title={translate('schedules.advanced-settings')}>
-  <p>
-    {translate('schedules.start-time')}
-    {spec?.startTime ?? translate('common.none')}
-  </p>
-  <p>
-    {translate('schedules.end-time')}{spec?.endTime ?? translate('common.none')}
-  </p>
-  <p>
-    {translate('schedules.jitter')}{spec?.jitter ?? translate('common.none')}
-  </p>
-  <p>
-    {translate('schedules.exclusion-calendar')}{spec?.excludeCalendar?.[0] ??
-      translate('common.none')}
-  </p>
-  {#if state?.limitedActions}
-    <p>
-      {translate('schedules.remaining-actions')}{state?.remainingActions ??
-        translate('common.none')}
-    </p>
-  {/if}
-  <p>
-    {translate('schedules.overlap-policy')}{policies?.overlapPolicy ??
-      translate('common.none')}
-  </p>
+  <ul class="settings-list">
+    <li>
+      {translate('schedules.start-time')}
+      <span> {spec?.startTime ?? translate('common.none')}</span>
+    </li>
+    <li>
+      {translate('schedules.end-time')}
+      <span>{spec?.endTime ?? translate('common.none')} </span>
+    </li>
+    <li>
+      {translate('schedules.jitter')}
+      <span>{spec?.jitter ?? translate('common.none')} </span>
+    </li>
+
+    <li>
+      {translate('schedules.exclusion-calendar')}
+      <span> {spec?.excludeCalendar?.[0] ?? translate('common.none')}</span>
+    </li>
+    {#if state?.limitedActions}
+      <li>
+        {translate('schedules.remaining-actions')}
+        <span>{state?.remainingActions ?? translate('common.none')} </span>
+      </li>
+    {/if}
+    <li>
+      {translate('schedules.overlap-policy')}
+      <span>{policies?.overlapPolicy ?? translate('common.none')} </span>
+    </li>
+  </ul>
 </Accordion>
+
+<style lang="postcss">
+  .settings-list {
+    @apply w-full;
+
+    li {
+      @apply flex flex-wrap items-center gap-2 border-b py-2 last-of-type:border-b-0;
+
+      span {
+        @apply surface-subtle select-all rounded-sm p-1 leading-4;
+      }
+    }
+  }
+</style>
diff --git a/src/lib/components/schedule/schedule-form-view.svelte b/src/lib/components/schedule/schedule-form-view.svelte
index 731ff6591..44cac18b9 100644
--- a/src/lib/components/schedule/schedule-form-view.svelte
+++ b/src/lib/components/schedule/schedule-form-view.svelte
@@ -11,22 +11,28 @@
   import Loading from '$lib/holocene/loading.svelte';
   import { translate } from '$lib/i18n/translate';
   import { error, loading } from '$lib/stores/schedules';
+  import type { SearchAttributeInput } from '$lib/stores/search-attributes';
   import type {
     FullSchedule,
     ScheduleParameters,
     SchedulePreset,
   } from '$lib/types/schedule';
+  import { decodePayloadAttributes } from '$lib/utilities/decode-payload';
   import {
     routeForSchedule,
     routeForSchedules,
   } from '$lib/utilities/route-for';
   import { writeActionsAreAllowed } from '$lib/utilities/write-actions-are-allowed';
 
+  import AddSearchAttributes from '../workflow/add-search-attributes.svelte';
+
   import ScheduleInputPayload from './schedule-input-payload.svelte';
 
-  import type { Schedule } from '$types';
+  import type { Schedule, SearchAttribute } from '$types';
 
   export let schedule: FullSchedule | null = null;
+  export let searchAttributes: SearchAttribute = {};
+
   export let onConfirm: (
     preset: SchedulePreset,
     args: Partial<ScheduleParameters>,
@@ -52,9 +58,17 @@
 
   let errors = {};
   let name = scheduleId ?? '';
-  let workflowType = schedule?.action?.startWorkflow?.workflowType?.name ?? '';
-  let workflowId = schedule?.action?.startWorkflow?.workflowId ?? '';
-  let taskQueue = schedule?.action?.startWorkflow?.taskQueue?.name ?? '';
+  const decodedWorkflow = decodePayloadAttributes(
+    schedule?.action?.startWorkflow,
+  );
+  const decodedSearchAttributes = decodePayloadAttributes({ searchAttributes });
+  const indexedFields =
+    decodedSearchAttributes?.searchAttributes.indexedFields ??
+    ({} as { [k: string]: string });
+
+  let workflowType = decodedWorkflow?.workflowType?.name ?? '';
+  let workflowId = decodedWorkflow?.workflowId ?? '';
+  let taskQueue = decodedWorkflow?.taskQueue?.name ?? '';
   let input = '';
   let daysOfWeek: string[] = [];
   let daysOfMonth: number[] = [];
@@ -65,6 +79,9 @@
   let second = '';
   let phase = '';
   let cronString = '';
+  let searchAttributesInput: SearchAttributeInput[] = Object.entries(
+    indexedFields,
+  ).map(([attribute, value]) => ({ attribute, value }));
 
   const handleConfirm = (preset: SchedulePreset, schedule?: Schedule) => {
     const args: Partial<ScheduleParameters> = {
@@ -82,6 +99,7 @@
       daysOfMonth,
       days,
       months,
+      searchAttributes: searchAttributesInput,
     };
 
     onConfirm(preset, args, schedule);
@@ -145,9 +163,7 @@
       <h1>{title}</h1>
     </header>
     <form class="mb-4 flex w-full flex-col gap-4 md:w-2/3 xl:w-1/2">
-      <Alert intent="error" title="" hidden={!$error}>
-        {$error}
-      </Alert>
+      <Alert intent="error" title={$error} hidden={!$error} />
       <div class="w-full">
         <Input
           id="name"
@@ -158,6 +174,7 @@
           disabled={Boolean(scheduleId)}
           on:input={onInput}
           on:blur={onBlur}
+          required
         />
       </div>
       <div class="w-full">
@@ -168,6 +185,7 @@
           error={errors['workflowType']}
           on:input={onInput}
           on:blur={onBlur}
+          required
         />
       </div>
       <div class="w-full">
@@ -178,6 +196,7 @@
           error={errors['workflowId']}
           on:input={onInput}
           on:blur={onBlur}
+          required
         />
       </div>
       <div class="w-full">
@@ -188,6 +207,7 @@
           error={errors['taskQueue']}
           on:input={onInput}
           on:blur={onBlur}
+          required
         />
       </div>
       <ScheduleInputPayload
@@ -195,6 +215,10 @@
         payloads={schedule?.action?.startWorkflow?.input}
         error={errors['input']}
       />
+      <AddSearchAttributes
+        bind:attributesToAdd={searchAttributesInput}
+        class="w-full"
+      />
       <SchedulesCalendarView
         let:preset
         {schedule}
diff --git a/src/lib/components/schedule/schedule-search-attributes.svelte b/src/lib/components/schedule/schedule-search-attributes.svelte
new file mode 100644
index 000000000..df9124fd4
--- /dev/null
+++ b/src/lib/components/schedule/schedule-search-attributes.svelte
@@ -0,0 +1,37 @@
+<script lang="ts">
+  import Accordion from '$lib/holocene/accordion.svelte';
+  import { translate } from '$lib/i18n/translate';
+  import type { SearchAttribute } from '$lib/types';
+  import { decodePayloadAttributes } from '$lib/utilities/decode-payload';
+  import { pluralize } from '$lib/utilities/pluralize';
+
+  export let searchAttributes: SearchAttribute;
+
+  $: decodedSearchAttributes = decodePayloadAttributes({ searchAttributes });
+  $: indexedFields =
+    decodedSearchAttributes?.searchAttributes.indexedFields ?? {};
+  $: searchAttributeCount = Object.keys(indexedFields).length;
+</script>
+
+<Accordion
+  title={translate('events.custom-search-attributes')}
+  subtitle={`${searchAttributeCount} ${translate(
+    'events.custom-search',
+  )} ${pluralize(translate('events.attribute'), searchAttributeCount)}`}
+  expandable={searchAttributeCount > 0}
+>
+  {#if searchAttributeCount}
+    <ul class="w-full">
+      {#each Object.entries(indexedFields) as [searchAttrName, searchAttrValue]}
+        <li
+          class="flex flex-wrap items-center gap-2 border-b py-2 last-of-type:border-b-0"
+        >
+          <span class="break-all">{searchAttrName}</span>
+          <span class="surface-subtle select-all rounded-sm p-1 leading-4"
+            >{searchAttrValue}</span
+          >
+        </li>
+      {/each}
+    </ul>
+  {/if}
+</Accordion>
diff --git a/src/lib/components/schedule/schedules-table-row.svelte b/src/lib/components/schedule/schedules-table-row.svelte
index 3cb93a8c3..b4b274e89 100644
--- a/src/lib/components/schedule/schedules-table-row.svelte
+++ b/src/lib/components/schedule/schedules-table-row.svelte
@@ -4,7 +4,9 @@
   import WorkflowStatus from '$lib/components/workflow-status.svelte';
   import Link from '$lib/holocene/link.svelte';
   import { translate } from '$lib/i18n/translate';
+  import type { ConfigurableTableHeader } from '$lib/stores/configurable-table-columns';
   import { relativeTime, timeFormat } from '$lib/stores/time-format';
+  import { decodePayloadAttributes } from '$lib/utilities/decode-payload';
   import { formatDate } from '$lib/utilities/format-date';
   import {
     routeForEventHistory,
@@ -18,11 +20,14 @@
   let { namespace } = $page.params;
 
   export let schedule: ScheduleListEntry;
+  export let columns: ConfigurableTableHeader[];
 
   $: spec = schedule?.info?.spec;
   $: calendar = spec?.structuredCalendar?.[0];
   $: interval = spec?.interval?.[0];
   $: timezoneName = spec?.timezoneName || 'UTC';
+  $: searchAttributes = schedule?.searchAttributes ?? {};
+  $: decodedAttributes = decodePayloadAttributes({ searchAttributes });
 
   const sortRecentActions = (recentActions: ScheduleActionResult[]) => {
     return (
@@ -43,45 +48,60 @@
 </script>
 
 <tr>
-  <td class="cell">
-    <WorkflowStatus status={schedule?.info?.paused ? 'Paused' : 'Running'} />
-  </td>
-  <td class="cell whitespace-pre-line break-words">
-    <Link href={route}>{schedule.scheduleId}</Link>
-  </td>
-  <td class="cell whitespace-pre-line break-words max-md:hidden">
-    {schedule?.info?.workflowType?.name ?? ''}
-  </td>
-  <td class="cell truncate">
-    {#each sortRecentActions(schedule?.info?.recentActions) as run}
-      <p>
-        <Link
-          href={routeForEventHistory({
-            namespace,
-            workflow: run?.startWorkflowResult?.workflowId,
-            run: run?.startWorkflowResult?.runId,
-          })}
-          >{formatDate(run?.actualTime, $timeFormat, {
-            relative: $relativeTime,
-          })}</Link
-        >
-      </p>
-    {/each}
-  </td>
-  <td class="cell truncate">
-    {#each schedule?.info?.futureActionTimes?.slice(0, 5) ?? [] as run}
-      <div>
-        {formatDate(run, $timeFormat, {
-          relative: $relativeTime,
-          relativeLabel: translate('common.from-now'),
-        })}
-      </div>
-    {/each}
-  </td>
-  <td class="cell">
-    <p>{@html translate('common.timezone', { timezone: timezoneName })}</p>
-    <ScheduleBasicFrequency {calendar} {interval} />
-  </td>
+  {#each columns as { label } (label)}
+    {#if label === translate('common.status')}
+      <td class="cell">
+        <WorkflowStatus
+          status={schedule?.info?.paused ? 'Paused' : 'Running'}
+        />
+      </td>
+    {:else if label === translate('schedules.id')}
+      <td class="cell whitespace-pre-line break-words">
+        <Link href={route}>{schedule.scheduleId}</Link>
+      </td>
+    {:else if label === translate('common.workflow-type')}
+      <td class="cell whitespace-pre-line break-words">
+        {schedule?.info?.workflowType?.name ?? ''}
+      </td>
+    {:else if label === translate('schedules.recent-runs')}
+      <td class="cell truncate">
+        {#each sortRecentActions(schedule?.info?.recentActions) as run}
+          <p>
+            <Link
+              href={routeForEventHistory({
+                namespace,
+                workflow: run?.startWorkflowResult?.workflowId,
+                run: run?.startWorkflowResult?.runId,
+              })}
+              >{formatDate(run?.actualTime, $timeFormat, {
+                relative: $relativeTime,
+              })}</Link
+            >
+          </p>
+        {/each}
+      </td>
+    {:else if label === translate('schedules.upcoming-runs')}
+      <td class="cell truncate">
+        {#each schedule?.info?.futureActionTimes?.slice(0, 5) ?? [] as run}
+          <div>
+            {formatDate(run, $timeFormat, {
+              relative: $relativeTime,
+              relativeLabel: translate('common.from-now'),
+            })}
+          </div>
+        {/each}
+      </td>
+    {:else if label === translate('schedules.schedule-spec')}
+      <td class="cell">
+        <p>{@html translate('common.timezone', { timezone: timezoneName })}</p>
+        <ScheduleBasicFrequency {calendar} {interval} />
+      </td>
+    {:else}
+      <td class="cell">
+        {decodedAttributes?.searchAttributes?.indexedFields?.[label] ?? ''}
+      </td>
+    {/if}
+  {/each}
 </tr>
 
 <style lang="postcss">
diff --git a/src/lib/components/workflow/filter-search/boolean-filter.svelte b/src/lib/components/search-attribute-filter/boolean-filter.svelte
similarity index 100%
rename from src/lib/components/workflow/filter-search/boolean-filter.svelte
rename to src/lib/components/search-attribute-filter/boolean-filter.svelte
diff --git a/src/lib/components/workflow/filter-search/close-filter-button.svelte b/src/lib/components/search-attribute-filter/close-filter-button.svelte
similarity index 100%
rename from src/lib/components/workflow/filter-search/close-filter-button.svelte
rename to src/lib/components/search-attribute-filter/close-filter-button.svelte
diff --git a/src/lib/components/workflow/filter-search/conditional-menu.svelte b/src/lib/components/search-attribute-filter/conditional-menu.svelte
similarity index 100%
rename from src/lib/components/workflow/filter-search/conditional-menu.svelte
rename to src/lib/components/search-attribute-filter/conditional-menu.svelte
diff --git a/src/lib/components/workflow/filter-search/datetime-filter.svelte b/src/lib/components/search-attribute-filter/datetime-filter.svelte
similarity index 100%
rename from src/lib/components/workflow/filter-search/datetime-filter.svelte
rename to src/lib/components/search-attribute-filter/datetime-filter.svelte
diff --git a/src/lib/components/workflow/filter-search/duration-filter.svelte b/src/lib/components/search-attribute-filter/duration-filter.svelte
similarity index 93%
rename from src/lib/components/workflow/filter-search/duration-filter.svelte
rename to src/lib/components/search-attribute-filter/duration-filter.svelte
index 2d05a808e..9da995f6e 100644
--- a/src/lib/components/workflow/filter-search/duration-filter.svelte
+++ b/src/lib/components/search-attribute-filter/duration-filter.svelte
@@ -33,11 +33,11 @@
   };
 </script>
 
-<ConditionalMenu inputId="duration-filter-search" noBorderLeft>
+<ConditionalMenu inputId="duration-filter" noBorderLeft>
   <Input
     label={$filter.attribute}
     labelHidden
-    id="duration-filter-search"
+    id="duration-filter"
     type="search"
     placeholder={`${translate('common.enter')} ${
       $filter.attribute
diff --git a/src/lib/components/workflow/filter-search/filter-list.svelte b/src/lib/components/search-attribute-filter/filter-list.svelte
similarity index 89%
rename from src/lib/components/workflow/filter-search/filter-list.svelte
rename to src/lib/components/search-attribute-filter/filter-list.svelte
index 4daf0581e..eaf3ac859 100644
--- a/src/lib/components/workflow/filter-search/filter-list.svelte
+++ b/src/lib/components/search-attribute-filter/filter-list.svelte
@@ -9,8 +9,8 @@
   import Button from '$lib/holocene/button.svelte';
   import Chip from '$lib/holocene/chip.svelte';
   import { translate } from '$lib/i18n/translate';
+  import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
   import { isWorkflowStatusType } from '$lib/models/workflow-status';
-  import { workflowFilters } from '$lib/stores/filters';
   import {
     relativeTime,
     timeFormat,
@@ -21,22 +21,24 @@
   import {
     isDateTimeFilter,
     isTextFilter,
-  } from '$lib/utilities/query/filter-search';
+  } from '$lib/utilities/query/search-attribute-filter';
   import { emptyFilter } from '$lib/utilities/query/to-list-workflow-filters';
   import { updateQueryParamsFromFilter } from '$lib/utilities/query/to-list-workflow-filters';
 
   import { FILTER_CONTEXT, type FilterContext } from './index.svelte';
 
+  export let filters: SearchAttributeFilter[];
+
   const { filter, activeQueryIndex } =
     getContext<FilterContext>(FILTER_CONTEXT);
 
   const removeQuery = (index: number) => {
-    $workflowFilters.splice(index, 1);
-    $workflowFilters = $workflowFilters;
-    updateQueryParamsFromFilter($page.url, $workflowFilters);
+    filters.splice(index, 1);
+    filters = filters;
+    updateQueryParamsFromFilter($page.url, filters);
 
-    if (index === $workflowFilters.length) {
-      const previousQuery = $workflowFilters[$workflowFilters.length - 1];
+    if (index === filters.length) {
+      const previousQuery = filters[filters.length - 1];
       if (previousQuery) {
         previousQuery.operator = '';
       }
@@ -52,8 +54,8 @@
 
   let totalFiltersInView = 5;
 
-  $: visibleFilters = $workflowFilters.slice(0, totalFiltersInView);
-  $: hasMoreFilters = totalFiltersInView < $workflowFilters.length;
+  $: visibleFilters = filters.slice(0, totalFiltersInView);
+  $: hasMoreFilters = totalFiltersInView < filters.length;
 
   const viewMoreFilters = () => {
     if (hasMoreFilters) {
diff --git a/src/lib/components/workflow/filter-search/index.svelte b/src/lib/components/search-attribute-filter/index.svelte
similarity index 57%
rename from src/lib/components/workflow/filter-search/index.svelte
rename to src/lib/components/search-attribute-filter/index.svelte
index b30f82b68..aa30ab37a 100644
--- a/src/lib/components/workflow/filter-search/index.svelte
+++ b/src/lib/components/search-attribute-filter/index.svelte
@@ -8,7 +8,7 @@
   export const FILTER_CONTEXT = 'filter-context';
 
   export interface FilterContext {
-    filter: Writable<WorkflowFilter>;
+    filter: Writable<SearchAttributeFilter>;
     activeQueryIndex: Writable<number>;
     handleSubmit: () => void;
     focusedElementId: Writable<string>;
@@ -19,26 +19,12 @@
 <script lang="ts">
   import { page } from '$app/stores';
 
-  import IsTemporalServerVersionGuard from '$lib/components/is-temporal-server-version-guard.svelte';
-  import WorkflowAdvancedSearch from '$lib/components/workflow/workflow-advanced-search.svelte';
   import Button from '$lib/holocene/button.svelte';
-  import Icon from '$lib/holocene/icon/icon.svelte';
-  import MenuButton from '$lib/holocene/menu/menu-button.svelte';
-  import MenuContainer from '$lib/holocene/menu/menu-container.svelte';
-  import MenuItem from '$lib/holocene/menu/menu-item.svelte';
-  import Menu from '$lib/holocene/menu/menu.svelte';
-  import ToggleSwitch from '$lib/holocene/toggle-switch.svelte';
   import { translate } from '$lib/i18n/translate';
-  import type { WorkflowFilter } from '$lib/models/workflow-filters';
-  import { showChildWorkflows, workflowFilters } from '$lib/stores/filters';
-  import { searchInputViewOpen } from '$lib/stores/filters';
+  import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
   import { currentPageKey } from '$lib/stores/pagination';
-  import {
-    canFetchChildWorkflows,
-    refresh,
-    workflows,
-  } from '$lib/stores/workflows';
-  import { exportWorkflows } from '$lib/utilities/export-workflows';
+  import { sortedSearchAttributeOptions } from '$lib/stores/search-attributes';
+  import { toListWorkflowQueryFromFilters } from '$lib/utilities/query/filter-workflow-query';
   import {
     getFocusedElementId,
     isBooleanFilter,
@@ -47,8 +33,7 @@
     isNumberFilter,
     isStatusFilter,
     isTextFilter,
-  } from '$lib/utilities/query/filter-search';
-  import { toListWorkflowQueryFromFilters } from '$lib/utilities/query/filter-workflow-query';
+  } from '$lib/utilities/query/search-attribute-filter';
   import {
     combineFilters,
     emptyFilter,
@@ -65,15 +50,18 @@
   import StatusFilter from './status-filter.svelte';
   import TextFilter from './text-filter.svelte';
 
-  export let onClickConfigure: () => void;
+  export let filters: SearchAttributeFilter[];
+  export let options = $sortedSearchAttributeOptions;
+  export let showFilter = true;
+  export let refresh: () => void;
 
-  const filter = writable<WorkflowFilter>(emptyFilter());
+  const filter = writable<SearchAttributeFilter>(emptyFilter());
   const activeQueryIndex = writable<number>(null);
   const focusedElementId = writable<string>('');
 
   $: ({ attribute, type } = $filter);
   $: searchParamQuery = $page.url.searchParams.get('query');
-  $: showClearAllButton = $workflowFilters.length && !attribute;
+  $: showClearAllButton = showFilter && filters.length && !attribute;
 
   setContext<FilterContext>(FILTER_CONTEXT, {
     filter,
@@ -84,12 +72,10 @@
   });
 
   function onSearch() {
-    const searchQuery = toListWorkflowQueryFromFilters(
-      combineFilters($workflowFilters),
-    );
+    const searchQuery = toListWorkflowQueryFromFilters(combineFilters(filters));
 
     if (searchQuery && searchQuery === searchParamQuery) {
-      $refresh = Date.now();
+      refresh();
     } else {
       updateQueryParameters({
         url: $page.url,
@@ -103,17 +89,17 @@
 
   function handleSubmit() {
     if ($activeQueryIndex !== null) {
-      $workflowFilters[$activeQueryIndex] = $filter;
+      filters[$activeQueryIndex] = $filter;
       $activeQueryIndex = null;
     } else {
-      $workflowFilters = [...$workflowFilters, $filter];
+      filters = [...filters, $filter];
     }
     filter.set(emptyFilter());
     onSearch();
   }
 
   function handleClearInput() {
-    $workflowFilters = [];
+    filters = [];
     onSearch();
   }
 
@@ -124,6 +110,7 @@
   }
 
   $: $activeQueryIndex, updateFocusedElementId();
+  $: !showFilter && resetFilter();
 
   function updateFocus() {
     if ($focusedElementId) {
@@ -155,9 +142,8 @@
 
 <div class="flex grow flex-col">
   <div class="flex grow flex-col gap-4 sm:flex-row sm:items-center">
-    {#if $searchInputViewOpen}
-      <WorkflowAdvancedSearch />
-    {:else}
+    <slot />
+    {#if showFilter}
       <div
         class="flex items-center"
         class:filter={!showClearAllButton}
@@ -165,9 +151,9 @@
         role="none"
       >
         {#if isStatusFilter(attribute)}
-          <StatusFilter />
+          <StatusFilter bind:filters />
         {:else}
-          <SearchAttributeMenu />
+          <SearchAttributeMenu {filters} {options} />
         {/if}
 
         {#if attribute}
@@ -181,9 +167,9 @@
             </div>
             <!-- TODO: Add KeywordList support -->
             <!-- {:else if isListFilter(attribute)}
-        <div class="w-full" in:fly={{ x: -100, duration: 150 }}>
-          <ListFilter />
-        </div> -->
+            <div class="w-full" in:fly={{ x: -100, duration: 150 }}>
+                <ListFilter />
+            </div> -->
           {:else if isDurationFilter(attribute)}
             <div
               class="flex w-full items-center"
@@ -219,70 +205,21 @@
           {/if}
         {/if}
       </div>
-
-      <div
-        class="flex flex-col sm:flex-row {showClearAllButton
-          ? 'w-full justify-between'
-          : 'justify-end'}"
-      >
-        {#if showClearAllButton}
-          <Button variant="ghost" on:click={handleClearInput}
-            >{translate('common.clear-all')}</Button
-          >
-        {/if}
-      </div>
     {/if}
-    <MenuContainer>
-      <MenuButton
-        controls="filter-configuration-menu"
-        count={Number($searchInputViewOpen) +
-          Number($canFetchChildWorkflows && $showChildWorkflows)}
-        data-testid="filter-configuration-menu-button"
-        class="max-w-[3rem] text-nowrap md:max-w-full"
-      >
-        <svelte:fragment slot="leading">
-          <Icon name="settings" />
-        </svelte:fragment>
-      </MenuButton>
-      <Menu id="filter-configuration-menu" position="right">
-        <div class="flex flex-col items-start gap-4 p-4 md:items-end">
-          <IsTemporalServerVersionGuard minimumVersion="1.23.0">
-            <ToggleSwitch
-              data-testid="show-child-workflow-toggle"
-              label={translate('workflows.show-children')}
-              labelPosition="left"
-              id="show-child-workflow-input"
-              bind:checked={$showChildWorkflows}
-            />
-          </IsTemporalServerVersionGuard>
-          <ToggleSwitch
-            data-testid="manual-search-toggle"
-            label={translate('workflows.view-search-input')}
-            labelPosition="left"
-            id="view-search-input"
-            bind:checked={$searchInputViewOpen}
-            on:change={resetFilter}
-          />
-          <MenuItem
-            on:click={onClickConfigure}
-            class="m-0 py-0.5"
-            data-testid="workflows-summary-table-configuration-button"
-          >
-            {translate('workflows.configure-workflows')}
-          </MenuItem>
-          <MenuItem
-            on:click={() => exportWorkflows($workflows)}
-            class="m-0 py-0.5"
-            data-testid="export-history-button"
-          >
-            {translate('common.download-json')}
-            <Icon name="download" />
-          </MenuItem>
-        </div>
-      </Menu>
-    </MenuContainer>
+    <div
+      class="flex flex-col sm:flex-row {showClearAllButton
+        ? 'w-full justify-between'
+        : 'justify-end'}"
+    >
+      {#if showClearAllButton}
+        <Button variant="ghost" on:click={handleClearInput}
+          >{translate('common.clear-all')}</Button
+        >
+      {/if}
+    </div>
+    <slot name="actions" />
   </div>
-  <FilterList />
+  <FilterList bind:filters />
 </div>
 
 <style lang="postcss">
diff --git a/src/lib/components/workflow/filter-search/list-filter.svelte b/src/lib/components/search-attribute-filter/list-filter.svelte
similarity index 97%
rename from src/lib/components/workflow/filter-search/list-filter.svelte
rename to src/lib/components/search-attribute-filter/list-filter.svelte
index bc5ce2071..bee8bf594 100644
--- a/src/lib/components/workflow/filter-search/list-filter.svelte
+++ b/src/lib/components/search-attribute-filter/list-filter.svelte
@@ -23,7 +23,7 @@
   <ChipInput
     label={$filter.attribute}
     labelHidden
-    id="list-filter-search"
+    id="list-filter"
     bind:chips={list}
     class="w-full rounded-none"
     removeChipButtonLabel={(chip) =>
diff --git a/src/lib/components/workflow/filter-search/number-filter.svelte b/src/lib/components/search-attribute-filter/number-filter.svelte
similarity index 91%
rename from src/lib/components/workflow/filter-search/number-filter.svelte
rename to src/lib/components/search-attribute-filter/number-filter.svelte
index 8c29ec89c..fc77793f9 100644
--- a/src/lib/components/workflow/filter-search/number-filter.svelte
+++ b/src/lib/components/search-attribute-filter/number-filter.svelte
@@ -24,11 +24,11 @@
   };
 </script>
 
-<ConditionalMenu inputId="number-filter-search" noBorderLeft>
+<ConditionalMenu inputId="number-filter" noBorderLeft>
   <NumberInput
     label={translate('common.number-input-placeholder')}
     labelHidden
-    id="number-filter-search"
+    id="number-filter"
     icon="search"
     placeholder={translate('common.number-input-placeholder')}
     bind:value={_value}
diff --git a/src/lib/components/workflow/filter-search/search-attribute-menu.svelte b/src/lib/components/search-attribute-filter/search-attribute-menu.svelte
similarity index 77%
rename from src/lib/components/workflow/filter-search/search-attribute-menu.svelte
rename to src/lib/components/search-attribute-filter/search-attribute-menu.svelte
index 9ff1539ef..91c7db8e4 100644
--- a/src/lib/components/workflow/filter-search/search-attribute-menu.svelte
+++ b/src/lib/components/search-attribute-filter/search-attribute-menu.svelte
@@ -10,22 +10,24 @@
     MenuItem,
   } from '$lib/holocene/menu';
   import { translate } from '$lib/i18n/translate';
-  import type { WorkflowFilter } from '$lib/models/workflow-filters';
-  import { workflowFilters } from '$lib/stores/filters';
-  import { sortedSearchAttributeOptions } from '$lib/stores/search-attributes';
-  import type { SearchAttributesValue } from '$lib/types/workflows';
+  import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
+  import type { SearchAttributeOption } from '$lib/stores/search-attributes';
+  import type { SearchAttributeType } from '$lib/types/workflows';
   import {
     getFocusedElementId,
     isListFilter,
-  } from '$lib/utilities/query/filter-search';
+  } from '$lib/utilities/query/search-attribute-filter';
   import { emptyFilter } from '$lib/utilities/query/to-list-workflow-filters';
 
   import { FILTER_CONTEXT, type FilterContext } from './index.svelte';
 
+  export let filters: SearchAttributeFilter[];
+  export let options: SearchAttributeOption[];
+
   const { filter, activeQueryIndex, focusedElementId } =
     getContext<FilterContext>(FILTER_CONTEXT);
 
-  function isOptionDisabled(value: string, filters: WorkflowFilter[]) {
+  function isOptionDisabled(value: string, filters: SearchAttributeFilter[]) {
     return filters.some(
       (filter) =>
         ['=', '!=', 'is', 'is not'].includes(filter.conditional) &&
@@ -33,7 +35,7 @@
     );
   }
 
-  function handleNewQuery(value: string, type: SearchAttributesValue) {
+  function handleNewQuery(value: string, type: SearchAttributeType) {
     searchAttributeValue = '';
     filter.set({ ...emptyFilter(), attribute: value, conditional: '=', type });
     $focusedElementId = getFocusedElementId({ attribute: value, type });
@@ -41,13 +43,13 @@
 
   let searchAttributeValue = '';
   //  TODO: Add KeywordList support
-  $: options = $sortedSearchAttributeOptions.filter(
+  $: _options = options.filter(
     ({ value, type }) => !isListFilter({ attribute: value, type }),
   );
 
   $: filteredOptions = !searchAttributeValue
-    ? options
-    : options.filter((option) =>
+    ? _options
+    : _options.filter((option) =>
         option.value.toLowerCase().includes(searchAttributeValue.toLowerCase()),
       );
 </script>
@@ -56,7 +58,7 @@
   <MenuButton
     controls="search-attribute-menu"
     disabled={$activeQueryIndex !== null}
-    count={$filter.attribute ? 0 : $workflowFilters.length}
+    count={$filter.attribute ? 0 : filters.length}
     on:click={() => (searchAttributeValue = '')}
     class="text-nowrap {!!$filter.attribute && 'attribute-selected'}"
   >
@@ -88,7 +90,7 @@
     </MenuItem>
 
     {#each filteredOptions as { value, label, type }}
-      {@const disabled = isOptionDisabled(value, $workflowFilters)}
+      {@const disabled = isOptionDisabled(value, filters)}
       <MenuItem
         on:click={() => {
           handleNewQuery(value, type);
diff --git a/src/lib/components/workflow/filter-search/status-filter.svelte b/src/lib/components/search-attribute-filter/status-filter.svelte
similarity index 74%
rename from src/lib/components/workflow/filter-search/status-filter.svelte
rename to src/lib/components/search-attribute-filter/status-filter.svelte
index bbc2e68d1..b6ee637d8 100644
--- a/src/lib/components/workflow/filter-search/status-filter.svelte
+++ b/src/lib/components/search-attribute-filter/status-filter.svelte
@@ -15,24 +15,25 @@
     MenuItem,
   } from '$lib/holocene/menu';
   import Translate from '$lib/i18n/translate.svelte';
-  import type { WorkflowFilter } from '$lib/models/workflow-filters';
+  import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
   import { workflowStatusFilters } from '$lib/models/workflow-status';
-  import { workflowFilters } from '$lib/stores/filters';
-  import { isStatusFilter } from '$lib/utilities/query/filter-search';
+  import { isStatusFilter } from '$lib/utilities/query/search-attribute-filter';
   import { updateQueryParamsFromFilter } from '$lib/utilities/query/to-list-workflow-filters';
 
   import { FILTER_CONTEXT, type FilterContext } from './index.svelte';
 
+  export let filters: SearchAttributeFilter[];
+
   const { filter, resetFilter } = getContext<FilterContext>(FILTER_CONTEXT);
   const open = writable(true);
-  $: filters = [...$workflowFilters];
-  $: statusFilters = filters.filter((filter) =>
+  $: _filters = [...filters];
+  $: statusFilters = _filters.filter((filter) =>
     isStatusFilter(filter.attribute),
   );
 
   function apply() {
-    $workflowFilters = filters;
-    updateQueryParamsFromFilter($page.url, $workflowFilters);
+    filters = _filters;
+    updateQueryParamsFromFilter($page.url, filters);
   }
 
   function mapStatusToFilter(value: string) {
@@ -42,12 +43,12 @@
     };
   }
 
-  function mapStatusesToFilters(filters: WorkflowFilter[]) {
-    if (filters.length === 1) {
-      return [mapStatusToFilter(filters[0].value)];
+  function mapStatusesToFilters(_filters: SearchAttributeFilter[]) {
+    if (_filters.length === 1) {
+      return [mapStatusToFilter(_filters[0].value)];
     } else {
-      return filters.map((filter, i) => {
-        const operator = i === filters.length - 1 ? '' : 'OR';
+      return _filters.map((filter, i) => {
+        const operator = i === _filters.length - 1 ? '' : 'OR';
         return {
           ...filter,
           operator,
@@ -58,14 +59,12 @@
 
   const onStatusClick = (status: string) => {
     if (status === 'All') {
-      filters = $workflowFilters.filter(
-        (f) => f.attribute !== 'ExecutionStatus',
-      );
+      _filters = filters.filter((f) => f.attribute !== 'ExecutionStatus');
     } else if (statusFilters.find((s) => s.value === status)) {
-      const nonStatusFilters = $workflowFilters.filter(
+      const nonStatusFilters = filters.filter(
         (f) => !isStatusFilter(f.attribute),
       );
-      filters = [
+      _filters = [
         ...nonStatusFilters,
         ...mapStatusesToFilters(
           statusFilters.filter((s) => s.value !== status),
@@ -73,12 +72,12 @@
       ];
     } else {
       if (!statusFilters.length) {
-        filters = [...filters, mapStatusToFilter(status)];
+        _filters = [..._filters, mapStatusToFilter(status)];
       } else {
-        const nonStatusFilters = filters.filter(
+        const nonStatusFilters = _filters.filter(
           (f) => !isStatusFilter(f.attribute),
         );
-        filters = [
+        _filters = [
           ...nonStatusFilters,
           ...mapStatusesToFilters([
             ...statusFilters,
diff --git a/src/lib/components/workflow/filter-search/text-filter.svelte b/src/lib/components/search-attribute-filter/text-filter.svelte
similarity index 82%
rename from src/lib/components/workflow/filter-search/text-filter.svelte
rename to src/lib/components/search-attribute-filter/text-filter.svelte
index bdf535f23..563bc0555 100644
--- a/src/lib/components/workflow/filter-search/text-filter.svelte
+++ b/src/lib/components/search-attribute-filter/text-filter.svelte
@@ -4,6 +4,7 @@
   import Input from '$lib/holocene/input/input.svelte';
   import { translate } from '$lib/i18n/translate';
   import { prefixSearchEnabled } from '$lib/stores/capability-enablement';
+  import { SEARCH_ATTRIBUTE_TYPE } from '$lib/types/workflows';
 
   import ConditionalMenu from './conditional-menu.svelte';
   import { FILTER_CONTEXT, type FilterContext } from './index.svelte';
@@ -21,20 +22,20 @@
     }
   }
 
-  let options = [
+  $: options = [
     { value: '=', label: translate('common.equal-to') },
     { value: '!=', label: translate('common.not-equal-to') },
-    ...($prefixSearchEnabled
+    ...($prefixSearchEnabled && $filter.type === SEARCH_ATTRIBUTE_TYPE.KEYWORD
       ? [{ value: 'STARTS_WITH', label: translate('common.starts-with') }]
       : []),
   ];
 </script>
 
-<ConditionalMenu {options} inputId="text-filter-search" noBorderLeft>
+<ConditionalMenu {options} inputId="text-filter" noBorderLeft>
   <Input
     label={$filter.attribute}
     labelHidden
-    id="text-filter-search"
+    id="text-filter"
     type="search"
     placeholder={`${translate('common.enter')} ${$filter.attribute}`}
     icon="search"
diff --git a/src/lib/components/workflow/add-search-attributes.svelte b/src/lib/components/workflow/add-search-attributes.svelte
new file mode 100644
index 000000000..ade23869d
--- /dev/null
+++ b/src/lib/components/workflow/add-search-attributes.svelte
@@ -0,0 +1,39 @@
+<script lang="ts">
+  import Button from '$lib/holocene/button.svelte';
+  import { translate } from '$lib/i18n/translate';
+  import {
+    customSearchAttributes,
+    type SearchAttributeInput as SAInput,
+  } from '$lib/stores/search-attributes';
+
+  import SearchAttributeInput from './search-attribute-input/index.svelte';
+
+  let className = '';
+  export { className as class };
+  export let attributesToAdd: SAInput[] = [];
+
+  const addSearchAttribute = () => {
+    attributesToAdd = [...attributesToAdd, { attribute: '', value: null }];
+  };
+
+  $: searchAttributes = Object.keys($customSearchAttributes);
+
+  const onRemove = (attribute: string) => {
+    attributesToAdd = attributesToAdd.filter((a) => a.attribute !== attribute);
+  };
+</script>
+
+<div class="flex flex-col gap-2 {className}">
+  {#each attributesToAdd as attribute}
+    <SearchAttributeInput {attributesToAdd} bind:attribute {onRemove} />
+  {/each}
+  <Button
+    variant="ghost"
+    leadingIcon="add"
+    on:click={addSearchAttribute}
+    disabled={!searchAttributes.length ||
+      attributesToAdd.length === searchAttributes.length ||
+      attributesToAdd.filter((a) => a.value === '' || a.value === null).length >
+        0}>{translate('workflows.add-search-attribute')}</Button
+  >
+</div>
diff --git a/src/lib/components/workflow/configurable-table-headers-drawer/index.svelte b/src/lib/components/workflow/configurable-table-headers-drawer/index.svelte
new file mode 100644
index 000000000..ad640dc51
--- /dev/null
+++ b/src/lib/components/workflow/configurable-table-headers-drawer/index.svelte
@@ -0,0 +1,47 @@
+<script lang="ts">
+  import type { Readable } from 'svelte/store';
+
+  import DrawerContent from '$lib/holocene/drawer-content.svelte';
+  import Drawer from '$lib/holocene/drawer.svelte';
+  import Icon from '$lib/holocene/icon/icon.svelte';
+  import { translate } from '$lib/i18n/translate';
+  import {
+    type ConfigurableTableHeader,
+    type ConfigurableTableType,
+    TABLE_TYPE,
+  } from '$lib/stores/configurable-table-columns';
+
+  import OrderableList from './orderable-list.svelte';
+
+  export let availableColumns: Readable<ConfigurableTableHeader[]>;
+  export let open: boolean;
+  export let table: ConfigurableTableType = TABLE_TYPE.WORKFLOWS;
+  export let type: string;
+  export let title: string;
+
+  const closeCustomizationDrawer = () => {
+    open = false;
+  };
+</script>
+
+<Drawer
+  {open}
+  onClick={closeCustomizationDrawer}
+  position="right"
+  id="{table}-table-configuration-drawer"
+  dark={false}
+  closeButtonLabel={translate('workflows.close-configure-headers', { title })}
+  class="w-[35vw] min-w-min max-w-fit"
+>
+  <DrawerContent title={translate('workflows.configure-headers', { title })}>
+    <svelte:fragment slot="subtitle">
+      Add (<Icon class="inline" name="add" />), re-arrange (<Icon
+        class="inline"
+        name="chevron-selector-vertical"
+      />), and remove (<Icon class="inline" name="hyphen" />), {type} Headings to
+      personalize the {title} Table.
+    </svelte:fragment>
+
+    <OrderableList {availableColumns} {table} {type} />
+  </DrawerContent>
+</Drawer>
diff --git a/src/lib/components/workflow/workflows-summary-configurable-table/orderable-list.svelte b/src/lib/components/workflow/configurable-table-headers-drawer/orderable-list.svelte
similarity index 74%
rename from src/lib/components/workflow/workflows-summary-configurable-table/orderable-list.svelte
rename to src/lib/components/workflow/configurable-table-headers-drawer/orderable-list.svelte
index efbfcfb68..1a9e6f6f5 100644
--- a/src/lib/components/workflow/workflows-summary-configurable-table/orderable-list.svelte
+++ b/src/lib/components/workflow/configurable-table-headers-drawer/orderable-list.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import type { Readable } from 'svelte/store';
+
   import { page } from '$app/stores';
 
   import OrderableListItem from '$lib/holocene/orderable-list/orderable-list-item.svelte';
@@ -7,26 +9,29 @@
   import {
     addColumn,
     availableCustomSearchAttributeColumns,
-    availableSystemSearchAttributeColumns,
+    configurableTableColumns,
+    type ConfigurableTableHeader,
+    type ConfigurableTableType,
     moveColumn,
     removeColumn,
-    workflowTableColumns,
-  } from '$lib/stores/workflow-table-columns';
+  } from '$lib/stores/configurable-table-columns';
 
-  export let namespace: string;
+  export let table: ConfigurableTableType;
+  export let availableColumns: Readable<ConfigurableTableHeader[]>;
+  export let type: string;
 
-  $: columnsInUse = $workflowTableColumns?.[namespace] ?? [];
-  $: availableSystemColumns = availableSystemSearchAttributeColumns(
+  $: namespace = $page.params.namespace;
+  $: columnsInUse = $configurableTableColumns?.[namespace]?.[table] ?? [];
+  $: availableCustomColumns = availableCustomSearchAttributeColumns(
     namespace,
-    $page.data.settings,
+    table,
   );
-  $: availableCustomColumns = availableCustomSearchAttributeColumns(namespace);
 </script>
 
 <div class="flex flex-col gap-4">
   <OrderableList>
     <svelte:fragment slot="heading">
-      Workflow Headings <span class="font-normal">(in view)</span>
+      {type} Headings <span class="font-normal">(in view)</span>
     </svelte:fragment>
     {#each columnsInUse as { label }, index (label)}
       <OrderableListItem
@@ -34,8 +39,8 @@
         {label}
         totalItems={columnsInUse.length}
         on:moveItem={(event) =>
-          moveColumn(event.detail.from, event.detail.to, namespace)}
-        on:removeItem={() => removeColumn(label, namespace)}
+          moveColumn(event.detail.from, event.detail.to, namespace, table)}
+        on:removeItem={() => removeColumn(label, namespace, table)}
         addButtonLabel={translate('workflows.add-column-label', {
           column: label,
         })}
@@ -66,10 +71,10 @@
     <svelte:fragment slot="heading">
       Available Headings <span class="font-normal">(not in view)</span>
     </svelte:fragment>
-    {#each $availableSystemColumns as { label }}
+    {#each $availableColumns as { label }}
       <OrderableListItem
         static
-        on:addItem={() => addColumn(label, namespace)}
+        on:addItem={() => addColumn(label, namespace, table)}
         addButtonLabel={translate('workflows.add-column-label', {
           column: label,
         })}
@@ -84,12 +89,13 @@
   </OrderableList>
   <OrderableList>
     <svelte:fragment slot="heading">
-      Custom Search Attributes <span class="font-normal">(not in view)</span>
+      {translate('events.custom-search-attributes')}
+      <span class="font-normal">(not in view)</span>
     </svelte:fragment>
     {#each $availableCustomColumns as { label }}
       <OrderableListItem
         static
-        on:addItem={() => addColumn(label, namespace)}
+        on:addItem={() => addColumn(label, namespace, table)}
         addButtonLabel={translate('workflows.add-column-label', {
           column: label,
         })}
diff --git a/src/lib/components/workflow/dropdown-filter/text-filter.svelte b/src/lib/components/workflow/dropdown-filter/text-filter.svelte
index 7c69f7e2d..1e618faa4 100644
--- a/src/lib/components/workflow/dropdown-filter/text-filter.svelte
+++ b/src/lib/components/workflow/dropdown-filter/text-filter.svelte
@@ -5,13 +5,14 @@
   import Input from '$lib/holocene/input/input.svelte';
   import { Menu, MenuButton, MenuContainer } from '$lib/holocene/menu';
   import { translate } from '$lib/i18n/translate';
+  import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
   import {
     attributeToHumanReadable,
     attributeToId,
     type TextFilterAttributes,
-    type WorkflowFilter,
   } from '$lib/models/workflow-filters';
   import { workflowFilters } from '$lib/stores/filters';
+  import { SEARCH_ATTRIBUTE_TYPE } from '$lib/types/workflows';
   import { updateQueryParamsFromFilter } from '$lib/utilities/query/to-list-workflow-filters';
 
   let value = '';
@@ -25,9 +26,9 @@
   const onInput = (e: Event) => {
     const { value } = e.target as HTMLInputElement;
     if (value) {
-      const filter: WorkflowFilter = {
+      const filter: SearchAttributeFilter = {
         attribute,
-        type: 'Keyword',
+        type: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
         value,
         conditional: '=',
         operator: '',
diff --git a/src/lib/components/workflow/dropdown-filter/workflow-datetime-filter.svelte b/src/lib/components/workflow/dropdown-filter/workflow-datetime-filter.svelte
index 99fc72c5c..1ed821b0d 100644
--- a/src/lib/components/workflow/dropdown-filter/workflow-datetime-filter.svelte
+++ b/src/lib/components/workflow/dropdown-filter/workflow-datetime-filter.svelte
@@ -21,9 +21,10 @@
   import MenuDivider from '$lib/holocene/menu/menu-divider.svelte';
   import TimePicker from '$lib/holocene/time-picker.svelte';
   import { translate } from '$lib/i18n/translate';
-  import type { WorkflowFilter } from '$lib/models/workflow-filters';
+  import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
   import { supportsAdvancedVisibility } from '$lib/stores/advanced-visibility';
   import { workflowFilters } from '$lib/stores/filters';
+  import { SEARCH_ATTRIBUTE_TYPE } from '$lib/types/workflows';
   import { getLocalTime } from '$lib/utilities/format-date';
   import { updateQueryParamsFromFilter } from '$lib/utilities/query/to-list-workflow-filters';
   import { columnOrderedDurations } from '$lib/utilities/to-duration';
@@ -80,9 +81,9 @@
     } else if (value === 'Custom') {
       custom = true;
     } else {
-      const filter: WorkflowFilter = {
+      const filter: SearchAttributeFilter = {
         attribute: timeField,
-        type: 'Datetime',
+        type: SEARCH_ATTRIBUTE_TYPE.DATETIME,
         value,
         conditional: '>',
         operator: '',
@@ -154,9 +155,9 @@
         )}"`
       : `> "${formatISO(startDateWithTime)}"`;
 
-    const filter: WorkflowFilter = {
+    const filter: SearchAttributeFilter = {
       attribute: timeField,
-      type: 'Datetime',
+      type: SEARCH_ATTRIBUTE_TYPE.DATETIME,
       value: query,
       conditional: '=',
       operator: '',
diff --git a/src/lib/components/workflow/dropdown-filter/workflow-status.svelte b/src/lib/components/workflow/dropdown-filter/workflow-status.svelte
index 978d8ba56..9165bec3a 100644
--- a/src/lib/components/workflow/dropdown-filter/workflow-status.svelte
+++ b/src/lib/components/workflow/dropdown-filter/workflow-status.svelte
@@ -12,19 +12,20 @@
   } from '$lib/holocene/menu';
   import { translate } from '$lib/i18n/translate';
   import Translate from '$lib/i18n/translate.svelte';
-  import type { WorkflowFilter } from '$lib/models/workflow-filters';
+  import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
   import { workflowStatusFilters } from '$lib/models/workflow-status';
   import { workflowFilters } from '$lib/stores/filters';
+  import { SEARCH_ATTRIBUTE_TYPE } from '$lib/types/workflows';
   import { updateQueryParamsFromFilter } from '$lib/utilities/query/to-list-workflow-filters';
 
   $: statusFilters = $workflowFilters.filter(
     (f) => f.attribute === 'ExecutionStatus',
   );
 
-  function mapStatusToFilter(value: string): WorkflowFilter {
+  function mapStatusToFilter(value: string): SearchAttributeFilter {
     return {
       attribute: 'ExecutionStatus',
-      type: 'Keyword',
+      type: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
       value,
       conditional: '=',
       operator: '',
@@ -32,7 +33,7 @@
     };
   }
 
-  function mapStatusesToFilters(filters: WorkflowFilter[]) {
+  function mapStatusesToFilters(filters: SearchAttributeFilter[]) {
     if (filters.length === 1) {
       return [mapStatusToFilter(filters[0].value)];
     } else {
diff --git a/src/lib/components/workflow/search-attribute-filter/index.svelte b/src/lib/components/workflow/search-attribute-filter/index.svelte
new file mode 100644
index 000000000..d5b202002
--- /dev/null
+++ b/src/lib/components/workflow/search-attribute-filter/index.svelte
@@ -0,0 +1,83 @@
+<script lang="ts">
+  import IsTemporalServerVersionGuard from '$lib/components/is-temporal-server-version-guard.svelte';
+  import SearchAttributeFilter from '$lib/components/search-attribute-filter/index.svelte';
+  import WorkflowAdvancedSearch from '$lib/components/workflow/workflow-advanced-search.svelte';
+  import Icon from '$lib/holocene/icon/icon.svelte';
+  import MenuButton from '$lib/holocene/menu/menu-button.svelte';
+  import MenuContainer from '$lib/holocene/menu/menu-container.svelte';
+  import MenuItem from '$lib/holocene/menu/menu-item.svelte';
+  import Menu from '$lib/holocene/menu/menu.svelte';
+  import ToggleSwitch from '$lib/holocene/toggle-switch.svelte';
+  import { translate } from '$lib/i18n/translate';
+  import { showChildWorkflows, workflowFilters } from '$lib/stores/filters';
+  import { searchInputViewOpen } from '$lib/stores/filters';
+  import { refresh } from '$lib/stores/workflows';
+  import { canFetchChildWorkflows, workflows } from '$lib/stores/workflows';
+  import { exportWorkflows } from '$lib/utilities/export-workflows';
+
+  export let onClickConfigure: () => void;
+</script>
+
+<SearchAttributeFilter
+  showFilter={!$searchInputViewOpen}
+  bind:filters={$workflowFilters}
+  refresh={() => {
+    $refresh = Date.now();
+  }}
+>
+  {#if $searchInputViewOpen}
+    <WorkflowAdvancedSearch />
+  {/if}
+  <svelte:fragment slot="actions">
+    <MenuContainer>
+      <MenuButton
+        controls="filter-configuration-menu"
+        count={Number($searchInputViewOpen) +
+          Number($canFetchChildWorkflows && $showChildWorkflows)}
+        data-testid="filter-configuration-menu-button"
+        class="max-w-[3rem] text-nowrap md:max-w-full"
+      >
+        <svelte:fragment slot="leading">
+          <Icon name="settings" />
+        </svelte:fragment>
+      </MenuButton>
+      <Menu id="filter-configuration-menu" position="right">
+        <div class="flex flex-col items-start gap-4 p-4 md:items-end">
+          <IsTemporalServerVersionGuard minimumVersion="1.23.0">
+            <ToggleSwitch
+              data-testid="show-child-workflow-toggle"
+              label={translate('workflows.show-children')}
+              labelPosition="left"
+              id="show-child-workflow-input"
+              bind:checked={$showChildWorkflows}
+            />
+          </IsTemporalServerVersionGuard>
+          <ToggleSwitch
+            data-testid="manual-search-toggle"
+            label={translate('workflows.view-search-input')}
+            labelPosition="left"
+            id="view-search-input"
+            bind:checked={$searchInputViewOpen}
+          />
+          <MenuItem
+            on:click={onClickConfigure}
+            class="m-0 py-0.5"
+            data-testid="workflows-summary-table-configuration-button"
+          >
+            {translate('workflows.configure-headers', {
+              title: translate('common.workflows', { count: 2 }),
+            })}
+          </MenuItem>
+          <MenuItem
+            on:click={() => exportWorkflows($workflows)}
+            class="m-0 py-0.5"
+            data-testid="export-history-button"
+          >
+            {translate('common.download-json')}
+            <Icon name="download" />
+          </MenuItem>
+        </div>
+      </Menu>
+    </MenuContainer>
+  </svelte:fragment>
+</SearchAttributeFilter>
diff --git a/src/lib/components/workflow/search-attribute-input/datetime-input.svelte b/src/lib/components/workflow/search-attribute-input/datetime-input.svelte
new file mode 100644
index 000000000..aea2f578c
--- /dev/null
+++ b/src/lib/components/workflow/search-attribute-input/datetime-input.svelte
@@ -0,0 +1,61 @@
+<script lang="ts">
+  import { startOfDay } from 'date-fns';
+  import { onMount } from 'svelte';
+
+  import DatePicker from '$lib/holocene/date-picker.svelte';
+  import TimePicker from '$lib/holocene/time-picker.svelte';
+  import { translate } from '$lib/i18n/translate';
+  import type { SearchAttributeInputValue } from '$lib/stores/search-attributes';
+  import { getUTCString } from '$lib/utilities/format-date';
+
+  export let value: SearchAttributeInputValue;
+
+  let date = startOfDay(new Date());
+  let hour = '';
+  let minute = '';
+  let second = '';
+
+  onMount(() => {
+    if (value) {
+      const datetime = new Date(value);
+      const utcDate = new Date(
+        datetime.getUTCFullYear(),
+        datetime.getUTCMonth(),
+        datetime.getUTCDate(),
+      );
+      date = startOfDay(utcDate);
+      hour = String(datetime.getUTCHours());
+      minute = String(datetime.getUTCMinutes());
+      second = String(datetime.getUTCSeconds());
+    } else {
+      updateDatetime();
+    }
+  });
+
+  const onDateChange = (d: CustomEvent) => {
+    date = startOfDay(d.detail);
+    updateDatetime();
+  };
+
+  const updateDatetime = () => {
+    value = getUTCString({ date, hour, minute, second });
+  };
+</script>
+
+<div class="flex flex-col gap-2">
+  <DatePicker
+    label="{translate('common.value')} ({translate('common.utc')})"
+    on:datechange={onDateChange}
+    selected={date}
+    todayLabel={translate('common.today')}
+    closeLabel={translate('common.close')}
+    clearLabel={translate('common.clear-input-button-label')}
+  />
+  <TimePicker
+    bind:hour
+    bind:minute
+    bind:second
+    twelveHourClock={false}
+    on:timechange={updateDatetime}
+  />
+</div>
diff --git a/src/lib/components/workflow/search-attribute-input/index.svelte b/src/lib/components/workflow/search-attribute-input/index.svelte
new file mode 100644
index 000000000..b4aa9752d
--- /dev/null
+++ b/src/lib/components/workflow/search-attribute-input/index.svelte
@@ -0,0 +1,79 @@
+<script lang="ts">
+  import Button from '$lib/holocene/button.svelte';
+  import Option from '$lib/holocene/select/option.svelte';
+  import Select from '$lib/holocene/select/select.svelte';
+  import { translate } from '$lib/i18n/translate';
+  import {
+    customSearchAttributes,
+    type SearchAttributeInput,
+  } from '$lib/stores/search-attributes';
+  import {
+    SEARCH_ATTRIBUTE_TYPE,
+    type SearchAttributes,
+  } from '$lib/types/workflows';
+
+  import DatetimeInput from './datetime-input.svelte';
+  import NumberInput from './number-input.svelte';
+  import TextInput from './text-input.svelte';
+
+  export let attributesToAdd: SearchAttributeInput[] = [];
+  export let searchAttributes: SearchAttributes = $customSearchAttributes;
+  export let attribute: SearchAttributeInput;
+  export let onRemove: (attribute: string) => void;
+
+  $: type = searchAttributes[attribute.attribute];
+  $: searchAttributesOptions = [...Object.entries(searchAttributes)]
+    .map(([key, value]) => ({ label: key, value: key, type: value }))
+    .filter(({ type }) => type !== 'KeywordList');
+
+  $: isDisabled = (value: string) => {
+    return !!attributesToAdd.find((a) => a.attribute === value);
+  };
+
+  const handleAttributeChange = (attr: string) => {
+    if (type !== searchAttributes[attr]) {
+      attribute.value = null;
+    }
+  };
+</script>
+
+<div class="flex items-start gap-2">
+  <div class="min-w-fit">
+    <Select
+      id="search-attribute"
+      label={translate('workflows.custom-search-attribute')}
+      class="w-full"
+      placeholder={translate('workflows.select-attribute')}
+      bind:value={attribute.attribute}
+      onChange={handleAttributeChange}
+    >
+      {#each searchAttributesOptions as { value, label, type }}
+        <Option disabled={isDisabled(value)} {value} description={type}
+          >{label}</Option
+        >
+      {/each}
+    </Select>
+  </div>
+  {#if type === SEARCH_ATTRIBUTE_TYPE.BOOL}
+    <Select
+      label={translate('common.value')}
+      id="attribute-value"
+      bind:value={attribute.value}
+    >
+      <Option value={true}>{translate('common.true')}</Option>
+      <Option value={false}>{translate('common.false')}</Option>
+    </Select>
+  {:else if type === SEARCH_ATTRIBUTE_TYPE.DATETIME}
+    <DatetimeInput bind:value={attribute.value} />
+  {:else if type === SEARCH_ATTRIBUTE_TYPE.INT || type === SEARCH_ATTRIBUTE_TYPE.DOUBLE}
+    <NumberInput bind:value={attribute.value} />
+  {:else}
+    <TextInput bind:value={attribute.value} />
+  {/if}
+  <Button
+    variant="ghost"
+    leadingIcon="close"
+    class="mt-6 w-10 rounded-full"
+    on:click={() => onRemove(attribute.attribute)}
+  />
+</div>
diff --git a/src/lib/components/workflow/search-attribute-input/number-input.svelte b/src/lib/components/workflow/search-attribute-input/number-input.svelte
new file mode 100644
index 000000000..d7081f24e
--- /dev/null
+++ b/src/lib/components/workflow/search-attribute-input/number-input.svelte
@@ -0,0 +1,27 @@
+<script lang="ts">
+  import { afterUpdate } from 'svelte';
+
+  import NumberInput from '$lib/holocene/input/number-input.svelte';
+  import { translate } from '$lib/i18n/translate';
+  import type { SearchAttributeInputValue } from '$lib/stores/search-attributes';
+
+  export let value: SearchAttributeInputValue;
+  $: _value = getValue(value);
+
+  afterUpdate(() => {
+    value = _value;
+  });
+
+  function getValue(value: number | string) {
+    const _numValue = Number(value);
+    const isZero = value === 0 || value === '0';
+    if (_numValue || isZero) return _numValue;
+    return null;
+  }
+</script>
+
+<NumberInput
+  label={translate('common.value')}
+  id="attribute-value"
+  bind:value={_value}
+/>
diff --git a/src/lib/components/workflow/search-attribute-input/text-input.svelte b/src/lib/components/workflow/search-attribute-input/text-input.svelte
new file mode 100644
index 000000000..391d84f2c
--- /dev/null
+++ b/src/lib/components/workflow/search-attribute-input/text-input.svelte
@@ -0,0 +1,21 @@
+<script lang="ts">
+  import { afterUpdate } from 'svelte';
+
+  import Input from '$lib/holocene/input/input.svelte';
+  import { translate } from '$lib/i18n/translate';
+  import type { SearchAttributeInputValue } from '$lib/stores/search-attributes';
+
+  export let value: SearchAttributeInputValue;
+  $: _value = value ? String(value) : null;
+
+  afterUpdate(() => {
+    value = _value;
+  });
+</script>
+
+<Input
+  label={translate('common.value')}
+  id="attribute-value"
+  class="grow"
+  bind:value={_value}
+/>
diff --git a/src/lib/components/workflow/start-workflow-search-attribute-input.svelte b/src/lib/components/workflow/start-workflow-search-attribute-input.svelte
deleted file mode 100644
index 24bfc5b25..000000000
--- a/src/lib/components/workflow/start-workflow-search-attribute-input.svelte
+++ /dev/null
@@ -1,69 +0,0 @@
-<script lang="ts">
-  import Button from '$lib/holocene/button.svelte';
-  import Input from '$lib/holocene/input/input.svelte';
-  import Option from '$lib/holocene/select/option.svelte';
-  import Select from '$lib/holocene/select/select.svelte';
-  import type {
-    SearchAttributeInput,
-    SearchAttributeOption,
-  } from '$lib/stores/search-attributes';
-
-  export let attributesToAdd: SearchAttributeInput[] = [];
-  export let searchAttributes: SearchAttributeOption[] = [];
-  export let attribute: SearchAttributeInput;
-  export let onRemove: (attribute: string) => void;
-
-  $: type =
-    searchAttributes.find((a) => a.value === attribute.attribute)?.type ?? '';
-
-  $: isDisabled = (value: string) => {
-    return !!attributesToAdd.find((a) => a.attribute === value);
-  };
-</script>
-
-<div class="flex items-end items-center justify-between gap-2">
-  <Select
-    id="search-attribute"
-    label="Custom Search Attribute"
-    placeholder="Select Attribute"
-    bind:value={attribute.attribute}
-  >
-    {#each searchAttributes as { value, label, type }}
-      <Option disabled={isDisabled(value)} {value} description={type}
-        >{label}</Option
-      >
-    {/each}
-  </Select>
-  {#if type === 'Bool'}
-    <Select
-      class="w-full"
-      label="Value"
-      id="attribute-value"
-      bind:value={attribute.value}
-    >
-      <Option value={true}>True</Option>
-      <Option value={false}>False</Option>
-    </Select>
-  {:else if type === 'Datetime'}
-    <Input
-      label="Value"
-      id="attribute-value"
-      type="datetime-local"
-      class="w-full"
-      bind:value={attribute.value}
-    />
-  {:else}
-    <Input
-      label="Value"
-      id="attribute-value"
-      class="w-full"
-      bind:value={attribute.value}
-    />
-  {/if}
-  <Button
-    variant="ghost"
-    leadingIcon="close"
-    class="mt-6 w-10 rounded-full"
-    on:click={() => onRemove(attribute.attribute)}
-  />
-</div>
diff --git a/src/lib/components/workflow/start-workflow-search-attributes.svelte b/src/lib/components/workflow/start-workflow-search-attributes.svelte
deleted file mode 100644
index 4dc6def4e..000000000
--- a/src/lib/components/workflow/start-workflow-search-attributes.svelte
+++ /dev/null
@@ -1,41 +0,0 @@
-<script lang="ts">
-  import Button from '$lib/holocene/button.svelte';
-  import {
-    customSearchAttributes,
-    type SearchAttributeInput,
-  } from '$lib/stores/search-attributes';
-
-  import StartWorkflowSearchAttributeInput from './start-workflow-search-attribute-input.svelte';
-
-  export let attributesToAdd: SearchAttributeInput[] = [];
-
-  const addSearchAttribute = () => {
-    attributesToAdd = [...attributesToAdd, { attribute: '', value: '' }];
-  };
-
-  $: searchAttributes = [...Object.entries($customSearchAttributes)].map(
-    ([key, value]) => ({ label: key, value: key, type: value }),
-  );
-
-  const onRemove = (attribute: string) => {
-    attributesToAdd = attributesToAdd.filter((a) => a.attribute !== attribute);
-  };
-</script>
-
-{#each attributesToAdd as attribute}
-  <StartWorkflowSearchAttributeInput
-    {attributesToAdd}
-    {searchAttributes}
-    bind:attribute
-    {onRemove}
-  />
-{/each}
-<Button
-  variant="ghost"
-  leadingIcon="add"
-  on:click={addSearchAttribute}
-  disabled={!searchAttributes.length ||
-    attributesToAdd.length === searchAttributes.length ||
-    attributesToAdd.filter((a) => a.value === '').length > 0}
-  >Add a Search Attribute</Button
->
diff --git a/src/lib/components/workflow/workflows-summary-configurable-table.svelte b/src/lib/components/workflow/workflows-summary-configurable-table.svelte
index 9dd0da8ed..5f85b0620 100644
--- a/src/lib/components/workflow/workflows-summary-configurable-table.svelte
+++ b/src/lib/components/workflow/workflows-summary-configurable-table.svelte
@@ -5,8 +5,8 @@
   import PaginatedTable from '$lib/holocene/table/paginated-table/paginated.svelte';
   import { translate } from '$lib/i18n/translate';
   import { fetchAllChildWorkflows } from '$lib/services/workflow-service';
+  import { configurableTableColumns } from '$lib/stores/configurable-table-columns';
   import { showChildWorkflows } from '$lib/stores/filters';
-  import { workflowTableColumns } from '$lib/stores/workflow-table-columns';
   import {
     refresh,
     updating,
@@ -21,7 +21,7 @@
   import TableRow from './workflows-summary-configurable-table/table-row.svelte';
 
   $: ({ namespace } = $page.params);
-  $: columns = $workflowTableColumns?.[namespace] ?? [];
+  $: columns = $configurableTableColumns?.[namespace]?.workflows ?? [];
   $: empty = $workflows.length === 0;
 
   let childrenIds: {
diff --git a/src/lib/components/workflow/workflows-summary-configurable-table/filterable-table-cell.svelte b/src/lib/components/workflow/workflows-summary-configurable-table/filterable-table-cell.svelte
index e3fdb61da..8c2907b3b 100644
--- a/src/lib/components/workflow/workflows-summary-configurable-table/filterable-table-cell.svelte
+++ b/src/lib/components/workflow/workflows-summary-configurable-table/filterable-table-cell.svelte
@@ -4,13 +4,16 @@
   import FilterOrCopyButtons from '$lib/holocene/filter-or-copy-buttons.svelte';
   import Link from '$lib/holocene/link.svelte';
   import { translate } from '$lib/i18n/translate';
+  import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
   import {
     searchAttributeToWorkflowKey,
     type TextFilterAttributes,
-    type WorkflowFilter,
   } from '$lib/models/workflow-filters';
   import { workflowFilters } from '$lib/stores/filters';
-  import type { WorkflowExecution } from '$lib/types/workflows';
+  import {
+    SEARCH_ATTRIBUTE_TYPE,
+    type WorkflowExecution,
+  } from '$lib/types/workflows';
   import { updateQueryParamsFromFilter } from '$lib/utilities/query/to-list-workflow-filters';
   import { routeForEventHistory } from '$lib/utilities/route-for';
 
@@ -32,9 +35,9 @@
       $workflowFilters.filter((f) => f.attribute !== attribute);
 
     if (!filter) {
-      const newFilter: WorkflowFilter = {
+      const newFilter: SearchAttributeFilter = {
         attribute,
-        type: 'Keyword',
+        type: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
         value,
         conditional: '=',
         operator: '',
diff --git a/src/lib/components/workflow/workflows-summary-configurable-table/table-body-cell.svelte b/src/lib/components/workflow/workflows-summary-configurable-table/table-body-cell.svelte
index d49c5e95e..c2546950c 100644
--- a/src/lib/components/workflow/workflows-summary-configurable-table/table-body-cell.svelte
+++ b/src/lib/components/workflow/workflows-summary-configurable-table/table-body-cell.svelte
@@ -1,21 +1,24 @@
 <script lang="ts">
   import WorkflowStatus from '$lib/components/workflow-status.svelte';
   import Badge from '$lib/holocene/badge.svelte';
+  import type { ConfigurableTableHeader } from '$lib/stores/configurable-table-columns';
   import {
     customSearchAttributes,
     isCustomSearchAttribute,
     workflowIncludesSearchAttribute,
   } from '$lib/stores/search-attributes';
   import { relativeTime, timeFormat } from '$lib/stores/time-format';
-  import type { WorkflowHeader } from '$lib/stores/workflow-table-columns';
-  import type { WorkflowExecution } from '$lib/types/workflows';
+  import {
+    SEARCH_ATTRIBUTE_TYPE,
+    type WorkflowExecution,
+  } from '$lib/types/workflows';
   import { formatBytes } from '$lib/utilities/format-bytes';
   import { formatDate } from '$lib/utilities/format-date';
   import { formatDistance } from '$lib/utilities/format-time';
 
   import FilterableTableCell from './filterable-table-cell.svelte';
 
-  export let column: WorkflowHeader;
+  export let column: ConfigurableTableHeader;
   export let workflow: WorkflowExecution;
 
   $: ({ label } = column);
@@ -112,11 +115,11 @@
         : ''}
     {:else if isCustomSearchAttribute(label) && workflowIncludesSearchAttribute(workflow, label)}
       {@const content = workflow.searchAttributes.indexedFields[label]}
-      {#if $customSearchAttributes[label] === 'Datetime' && typeof content === 'string'}
+      {#if $customSearchAttributes[label] === SEARCH_ATTRIBUTE_TYPE.DATETIME && typeof content === 'string'}
         {formatDate(content, $timeFormat, {
           relative: $relativeTime,
         })}
-      {:else if $customSearchAttributes[label] === 'Bool'}
+      {:else if $customSearchAttributes[label] === SEARCH_ATTRIBUTE_TYPE.BOOL}
         <Badge>{content}</Badge>
       {:else}
         {content}
@@ -127,7 +130,7 @@
 
 <style lang="postcss">
   .workflows-summary-table-body-cell {
-    @apply h-10 whitespace-nowrap px-2 text-sm;
+    @apply h-10 whitespace-nowrap;
 
     &.filterable {
       @apply relative pr-24;
diff --git a/src/lib/components/workflow/workflows-summary-configurable-table/table-header-cell.svelte b/src/lib/components/workflow/workflows-summary-configurable-table/table-header-cell.svelte
index e1c9fbaea..eeaaa4d51 100644
--- a/src/lib/components/workflow/workflows-summary-configurable-table/table-header-cell.svelte
+++ b/src/lib/components/workflow/workflows-summary-configurable-table/table-header-cell.svelte
@@ -1,20 +1,11 @@
 <script lang="ts">
-  import type { WorkflowHeader } from '$lib/stores/workflow-table-columns';
+  import type { ConfigurableTableHeader } from '$lib/stores/configurable-table-columns';
 
-  export let column: WorkflowHeader;
+  export let column: ConfigurableTableHeader;
 
   $: ({ label } = column);
 </script>
 
-<th
-  class="workflows-summary-table-header-cell"
-  data-testid="workflows-summary-table-header-cell-{label}"
->
+<th data-testid="workflows-summary-table-header-cell-{label}">
   {label}
 </th>
-
-<style lang="postcss">
-  .workflows-summary-table-header-cell {
-    @apply whitespace-nowrap px-2 text-left text-sm font-medium;
-  }
-</style>
diff --git a/src/lib/components/workflow/workflows-summary-configurable-table/table-header-row.svelte b/src/lib/components/workflow/workflows-summary-configurable-table/table-header-row.svelte
index 9baec53df..da24da995 100644
--- a/src/lib/components/workflow/workflows-summary-configurable-table/table-header-row.svelte
+++ b/src/lib/components/workflow/workflows-summary-configurable-table/table-header-row.svelte
@@ -65,7 +65,7 @@
   }
 
   .batch-actions-table-cell {
-    @apply overflow-visible whitespace-nowrap text-sm font-medium;
+    @apply overflow-visible whitespace-nowrap font-medium;
   }
 
   .configuration-button-table-cell {
diff --git a/src/lib/components/workflow/workflows-summary-configurable-table/table.svelte b/src/lib/components/workflow/workflows-summary-configurable-table/table.svelte
index 497d62bab..5c329511a 100644
--- a/src/lib/components/workflow/workflows-summary-configurable-table/table.svelte
+++ b/src/lib/components/workflow/workflows-summary-configurable-table/table.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import Loading from '$lib/holocene/loading.svelte';
   import ProgressBar from '$lib/holocene/progress-bar.svelte';
-  import type { WorkflowHeader } from '$lib/stores/workflow-table-columns';
+  import type { ConfigurableTableHeader } from '$lib/stores/configurable-table-columns';
   import { loading, updating } from '$lib/stores/workflows';
 
   export let pinned = false;
-  export let columns: WorkflowHeader[];
+  export let columns: ConfigurableTableHeader[];
 </script>
 
 <table class="workflows-summary-table" class:pinned>
diff --git a/src/lib/holocene/accordion.svelte b/src/lib/holocene/accordion.svelte
index 474330b1e..e44208546 100644
--- a/src/lib/holocene/accordion.svelte
+++ b/src/lib/holocene/accordion.svelte
@@ -91,8 +91,8 @@
     </div>
   </div>
 {:else}
-  <Card {...$$restProps}>
-    <div class="flex w-full flex-col rounded-lg p-2">
+  <Card class="w-full" {...$$restProps}>
+    <div class="flex w-full flex-col rounded-lg">
       <div class="space-between flex w-full flex-row items-center">
         <h3 class="flex w-full items-center gap-2">
           {#if icon}<Icon name={icon} />{/if}
@@ -111,7 +111,7 @@
       </p>
     </div>
 
-    <div class="mt-6 block w-full p-2">
+    <div class="mt-6 block w-full" class:hidden={!open}>
       <slot />
     </div>
   </Card>
diff --git a/src/lib/holocene/input/number-input.svelte b/src/lib/holocene/input/number-input.svelte
index 0281b5b13..72299db95 100644
--- a/src/lib/holocene/input/number-input.svelte
+++ b/src/lib/holocene/input/number-input.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import { twMerge as merge } from 'tailwind-merge';
+
   import type { IconName } from '$lib/holocene/icon';
   import Icon from '$lib/holocene/icon/icon.svelte';
   import Label from '$lib/holocene/label.svelte';
@@ -35,7 +37,7 @@
   }
 </script>
 
-<div class={$$props.class}>
+<div class={merge('flex flex-col gap-1', $$props.class)}>
   <Label {required} {label} hidden={labelHidden} for={id} />
   <div class="flex items-center gap-2">
     <div
diff --git a/src/lib/holocene/select/select.svelte b/src/lib/holocene/select/select.svelte
index 0596b2203..4f98cfc57 100644
--- a/src/lib/holocene/select/select.svelte
+++ b/src/lib/holocene/select/select.svelte
@@ -102,7 +102,7 @@
 </script>
 
 <MenuContainer {open}>
-  <Label {label} hidden={labelHidden} for={id} {required} />
+  <Label class="pb-1" {label} hidden={labelHidden} for={id} {required} />
   {#key $labelCtx}
     <MenuButton
       hasIndicator={!disabled}
diff --git a/src/lib/holocene/table/paginated-table/index.svelte b/src/lib/holocene/table/paginated-table/index.svelte
index 9dd4be8ad..08ffbf968 100644
--- a/src/lib/holocene/table/paginated-table/index.svelte
+++ b/src/lib/holocene/table/paginated-table/index.svelte
@@ -68,7 +68,7 @@
     }
 
     :global(tr > th) {
-      @apply px-2 text-left font-medium first-of-type:rounded-tl last-of-type:rounded-tr;
+      @apply whitespace-nowrap px-2 text-left font-medium first-of-type:rounded-tl last-of-type:rounded-tr;
     }
   }
 
@@ -98,7 +98,7 @@
     }
 
     :global(tr > td) {
-      @apply px-2;
+      @apply whitespace-nowrap px-2;
     }
 
     :global(tr > td > .table-link) {
diff --git a/src/lib/holocene/time-picker.svelte b/src/lib/holocene/time-picker.svelte
index cd0b3d7ba..56df9d4fa 100644
--- a/src/lib/holocene/time-picker.svelte
+++ b/src/lib/holocene/time-picker.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import { createEventDispatcher } from 'svelte';
+
   import Input from '$lib/holocene/input/input.svelte';
   import ToggleButton from '$lib/holocene/toggle-button/toggle-button.svelte';
   import ToggleButtons from '$lib/holocene/toggle-button/toggle-buttons.svelte';
@@ -10,6 +12,13 @@
   export let twelveHourClock = true;
   export let includeSeconds = true;
   export let disabled = false;
+
+  const dispatch = createEventDispatcher();
+
+  const onInput = (e: Event) => {
+    const target = e.target as HTMLInputElement;
+    dispatch('timechange', target.value);
+  };
 </script>
 
 <div class="flex gap-2">
@@ -24,6 +33,7 @@
     hideCount
     error={twelveHourClock ? parseInt(hour) > 12 : parseInt(hour) > 23}
     {disabled}
+    on:input={onInput}
   />
   <Input
     id="minute"
@@ -36,6 +46,7 @@
     hideCount
     error={Boolean(parseInt(hour) > 59)}
     {disabled}
+    on:input={onInput}
   />
   {#if includeSeconds}
     <Input
@@ -49,6 +60,7 @@
       hideCount
       error={Boolean(parseInt(hour) > 59)}
       {disabled}
+      on:input={onInput}
     />
   {/if}
   {#if twelveHourClock}
diff --git a/src/lib/i18n/locales/en/common.ts b/src/lib/i18n/locales/en/common.ts
index 0ffadbf8e..30df93180 100644
--- a/src/lib/i18n/locales/en/common.ts
+++ b/src/lib/i18n/locales/en/common.ts
@@ -160,7 +160,6 @@ export const Strings = {
   'more-options': 'More options',
   download: 'Download',
   duration: 'Duration',
-  'search-attributes': 'Search Attributes',
   'history-size-bytes': 'History Size (Bytes)',
   'execution-details': 'Execution Details',
   day: 'Day',
@@ -171,6 +170,7 @@ export const Strings = {
   active: 'Active',
   inactive: 'Inactive',
   'page-not-found': 'Page Not Found',
+  value: 'Value',
   table: 'Table',
   failure: 'Failure',
   'stack-trace': 'Stack Trace',
diff --git a/src/lib/i18n/locales/en/events.ts b/src/lib/i18n/locales/en/events.ts
index fe6af19a5..205b9e9f2 100644
--- a/src/lib/i18n/locales/en/events.ts
+++ b/src/lib/i18n/locales/en/events.ts
@@ -52,6 +52,9 @@ export const Strings = {
     'task-queue': 'Task Queue',
     workflow: 'Workflow',
   },
+  'custom-search-attributes': 'Custom Search Attributes',
+  'custom-search': 'custom search',
+  attribute: 'attribute',
   'event-group': 'Events related to {{eventName}}',
   'error-event': 'Error Event',
   'import-event-history': 'Import Event History',
diff --git a/src/lib/i18n/locales/en/schedules.ts b/src/lib/i18n/locales/en/schedules.ts
index 2382b32b2..d0fbd365f 100644
--- a/src/lib/i18n/locales/en/schedules.ts
+++ b/src/lib/i18n/locales/en/schedules.ts
@@ -7,13 +7,14 @@ export const Strings = {
   creating: 'Creating Schedule...',
   'back-to-schedule': 'Back to Schedule',
   'back-to-schedules': 'Back to Schedules',
-  name: 'Schedule Name',
+  id: 'Schedule ID',
   schedule: 'Schedule',
   frequency: 'Frequency',
   'schedule-spec': 'Schedule Spec',
   'schedule-input': 'Schedule Input',
   'empty-state-title': 'No Schedules Found',
-  'empty-state-description': 'Try a different search',
+  'empty-state-description':
+    'Try adjusting or clearing the filters to see the Schedules running on this Namespace.',
   'error-message-fetching': 'Error fetching schedules',
   'recent-runs': 'Recent Runs',
   'recent-runs-empty-state-title': 'No Recent Runs',
@@ -58,12 +59,12 @@ export const Strings = {
   'delete-modal-title': 'Delete Schedule?',
   'delete-modal-confirmation': 'Are you sure you want to delete {{schedule}}?',
   'advanced-settings': 'Advanced Settings ',
-  'start-time': 'Schedule Start Time: ',
-  'end-time': 'Schedule End Time: ',
-  jitter: 'Jitter: ',
-  'exclusion-calendar': 'Exclusion Calendar: ',
-  'remaining-actions': 'Remaining Actions: ',
-  'overlap-policy': 'Overlap Policy: ',
+  'start-time': 'Schedule Start Time',
+  'end-time': 'Schedule End Time',
+  jitter: 'Jitter',
+  'exclusion-calendar': 'Exclusion Calendar',
+  'remaining-actions': 'Remaining Actions',
+  'overlap-policy': 'Overlap Policy',
   'recurring-dates-heading': 'Recurring date(s)',
   'recurring-dates-description':
     'Select the specific dates for the schedule to always run on.',
@@ -84,10 +85,10 @@ export const Strings = {
   'cron-view-description':
     'Write or paste in a cron string to generate a schedule.',
   'error-title': 'Error Message',
-  'name-label': 'Name*',
-  'workflow-id-label': 'Workflow Id*',
-  'workflow-type-label': 'Workflow Type*',
-  'task-queue-label': 'Task Queue*',
+  'name-label': 'Name',
+  'workflow-id-label': 'Workflow Id',
+  'workflow-type-label': 'Workflow Type',
+  'task-queue-label': 'Task Queue',
   'getting-started-docs-link-preface': 'Go to',
   'getting-started-docs-link': 'docs',
   'getting-started-cli-link-preface': 'or get started with',
diff --git a/src/lib/i18n/locales/en/workflows.ts b/src/lib/i18n/locales/en/workflows.ts
index 7ac46b9a9..312c2b475 100644
--- a/src/lib/i18n/locales/en/workflows.ts
+++ b/src/lib/i18n/locales/en/workflows.ts
@@ -37,11 +37,10 @@ export const Strings = {
     'The batch cancel request is processing in the background.',
   'batch-reset-all-success':
     'The batch reset request is processing in the background.',
-  'configure-workflows': 'Configure Workflow List',
-  'open-configure-workflows': 'Open workflow list configuration',
-  'close-configure-workflows': 'Close workflow list configuration',
-  'configure-workflows-description':
-    'Add (<1></1>), re-arrange (<2></2>), and remove (<3></3>), Workflow Headings to personalize the Workflow List Table.',
+  'configure-headers': 'Configure {{title}}',
+  'close-configure-headers': 'Close {{title}} configuration',
+  'configure-headers-description':
+    'Add (<1></1>), re-arrange (<2></2>), and remove (<3></3>), {{type}} Headings to personalize the {{title}} Table.',
   'all-statuses': 'All Statuses',
   running: 'Running',
   'timed-out': 'Timed Out',
@@ -237,4 +236,7 @@ export const Strings = {
     'e.g. "2h45m", "hh:mm:ss", or "1000" nanoseconds',
   'start-workflow': 'Start Workflow',
   'start-workflow-like-this-one': 'Start Workflow Like This One',
+  'custom-search-attribute': 'Custom Search Attribute',
+  'select-attribute': 'Select Attribute',
+  'add-search-attribute': 'Add a Search Attribute',
 } as const;
diff --git a/src/lib/models/search-attribute-filters.ts b/src/lib/models/search-attribute-filters.ts
new file mode 100644
index 000000000..c0de1b6f7
--- /dev/null
+++ b/src/lib/models/search-attribute-filters.ts
@@ -0,0 +1,14 @@
+import type {
+  SearchAttributes,
+  SearchAttributeType,
+} from '$lib/types/workflows';
+
+export type SearchAttributeFilter = {
+  attribute: Extract<keyof SearchAttributes, string>;
+  type: SearchAttributeType;
+  value: string;
+  operator: string;
+  parenthesis: string;
+  conditional: string;
+  customDate?: boolean;
+};
diff --git a/src/lib/models/workflow-filters.ts b/src/lib/models/workflow-filters.ts
index 1e006ea7f..583a4b558 100644
--- a/src/lib/models/workflow-filters.ts
+++ b/src/lib/models/workflow-filters.ts
@@ -1,8 +1,4 @@
-import type {
-  SearchAttributes,
-  SearchAttributesValue,
-  WorkflowExecution,
-} from '$lib/types/workflows';
+import type { SearchAttributes, WorkflowExecution } from '$lib/types/workflows';
 
 export type TextFilterAttributes = 'WorkflowId' | 'WorkflowType' | 'RunId';
 export type TextFilterKeys = Extract<
@@ -31,16 +27,6 @@ export const searchAttributeToWorkflowKey: Record<
   RunId: 'runId',
 };
 
-export type WorkflowFilter = {
-  attribute: Extract<keyof SearchAttributes, string>;
-  type: SearchAttributesValue;
-  value: string;
-  operator: string;
-  parenthesis: string;
-  conditional: string;
-  customDate?: boolean;
-};
-
 export type SortOrder = 'asc' | 'desc';
 
 export type WorkflowSort = {
diff --git a/src/lib/pages/schedule-edit.svelte b/src/lib/pages/schedule-edit.svelte
index 544dda9a7..c61b73824 100644
--- a/src/lib/pages/schedule-edit.svelte
+++ b/src/lib/pages/schedule-edit.svelte
@@ -45,6 +45,7 @@
       daysOfMonth,
       days,
       months,
+      searchAttributes,
     } = args;
     const action: ScheduleActionParameters = {
       namespace,
@@ -53,6 +54,7 @@
       workflowId,
       taskQueue,
       input,
+      searchAttributes,
     };
     const spec: Partial<ScheduleSpecParameters> = {
       hour,
@@ -75,6 +77,6 @@
 
 {#await scheduleFetch}
   <Loading title={translate('schedules.loading')} />
-{:then { schedule }}
-  <ScheduleFormView onConfirm={handleEdit} {schedule} />
+{:then { schedule, searchAttributes }}
+  <ScheduleFormView onConfirm={handleEdit} {schedule} {searchAttributes} />
 {/await}
diff --git a/src/lib/pages/schedule-view.svelte b/src/lib/pages/schedule-view.svelte
index e389826e1..6dec760a1 100644
--- a/src/lib/pages/schedule-view.svelte
+++ b/src/lib/pages/schedule-view.svelte
@@ -11,6 +11,7 @@
   import ScheduleFrequencyPanel from '$lib/components/schedule/schedule-frequency-panel.svelte';
   import ScheduleInput from '$lib/components/schedule/schedule-input.svelte';
   import ScheduleRecentRuns from '$lib/components/schedule/schedule-recent-runs.svelte';
+  import ScheduleSearchAttributes from '$lib/components/schedule/schedule-search-attributes.svelte';
   import ScheduleUpcomingRuns from '$lib/components/schedule/schedule-upcoming-runs.svelte';
   import WorkflowCounts from '$lib/components/workflow/workflow-counts.svelte';
   import WorkflowStatus from '$lib/components/workflow-status.svelte';
@@ -390,6 +391,9 @@
             policies={schedule?.schedule?.policies}
             notes={schedule?.schedule?.state?.notes}
           />
+          <ScheduleSearchAttributes
+            searchAttributes={schedule?.searchAttributes ?? {}}
+          />
         </div>
         <div class="flex w-full flex-col gap-4 xl:w-1/3">
           <ScheduleInput
diff --git a/src/lib/pages/schedules-create.svelte b/src/lib/pages/schedules-create.svelte
index 9db2127c3..60750bf1d 100644
--- a/src/lib/pages/schedules-create.svelte
+++ b/src/lib/pages/schedules-create.svelte
@@ -32,6 +32,7 @@
       daysOfMonth,
       days,
       months,
+      searchAttributes,
     } = args;
 
     const action: ScheduleActionParameters = {
@@ -41,6 +42,7 @@
       workflowId,
       taskQueue,
       input,
+      searchAttributes,
     };
     const spec: Partial<ScheduleSpecParameters> = {
       hour,
diff --git a/src/lib/pages/schedules.svelte b/src/lib/pages/schedules.svelte
index e43e8f27a..1a3a7b213 100644
--- a/src/lib/pages/schedules.svelte
+++ b/src/lib/pages/schedules.svelte
@@ -1,44 +1,89 @@
 <script lang="ts">
-  import { noop } from 'svelte/internal';
+  import { onMount } from 'svelte';
 
   import { goto } from '$app/navigation';
   import { page } from '$app/stores';
 
   import SchedulesCount from '$lib/components/schedule/schedules-count.svelte';
   import SchedulesTableRow from '$lib/components/schedule/schedules-table-row.svelte';
+  import SearchAttributeFilter from '$lib/components/search-attribute-filter/index.svelte';
+  import ConfigurableTableHeadersDrawer from '$lib/components/workflow/configurable-table-headers-drawer/index.svelte';
+  import Alert from '$lib/holocene/alert.svelte';
   import Button from '$lib/holocene/button.svelte';
   import EmptyState from '$lib/holocene/empty-state.svelte';
-  import Input from '$lib/holocene/input/input.svelte';
   import Link from '$lib/holocene/link.svelte';
   import PaginatedTable from '$lib/holocene/table/paginated-table/api-paginated.svelte';
   import { translate } from '$lib/i18n/translate';
   import { fetchPaginatedSchedules } from '$lib/services/schedule-service';
+  import { isCloud } from '$lib/stores/advanced-visibility';
+  import {
+    availableScheduleColumns,
+    configurableTableColumns,
+    TABLE_TYPE,
+  } from '$lib/stores/configurable-table-columns';
   import { coreUserStore } from '$lib/stores/core-user';
+  import { scheduleFilters } from '$lib/stores/filters';
   import { schedulesCount } from '$lib/stores/schedules';
-  import type { ScheduleListEntry } from '$lib/types';
+  import {
+    customSearchAttributes,
+    searchAttributes,
+  } from '$lib/stores/search-attributes';
+  import { temporalVersion } from '$lib/stores/versions';
+  import { SEARCH_ATTRIBUTE_TYPE } from '$lib/types/workflows';
+  import { toListWorkflowFilters } from '$lib/utilities/query/to-list-workflow-filters';
+  import type { APIErrorResponse } from '$lib/utilities/request-from-api';
   import { routeForScheduleCreate } from '$lib/utilities/route-for';
+  import { minimumVersionRequired } from '$lib/utilities/version-check';
   import { writeActionsAreAllowed } from '$lib/utilities/write-actions-are-allowed';
 
-  $: namespace = $page.params.namespace;
-
+  let refresh = Date.now();
   let coreUser = coreUserStore();
+  let customizationDrawerOpen = false;
+  let error = '';
+
+  const openCustomizationDrawer = () => {
+    customizationDrawerOpen = true;
+  };
+
+  $: namespace = $page.params.namespace;
+  $: columns = $configurableTableColumns?.[namespace]?.schedules ?? [];
   $: createDisabled = $coreUser.namespaceWriteDisabled(namespace);
+  $: searchAttributeOptions = Object.entries({
+    ...(($isCloud || minimumVersionRequired('1.25.0', $temporalVersion)) && {
+      ScheduleId: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+    }),
+    ...$customSearchAttributes,
+  }).map(([key, value]) => {
+    return {
+      label: key,
+      value: key,
+      type: value,
+    };
+  });
+  $: query = $page.url.searchParams.get('query');
+  $: onFetch = () => {
+    error = '';
+    return fetchPaginatedSchedules(namespace, query, onError);
+  };
+  $: availableColumns = availableScheduleColumns(namespace);
 
-  $: onFetch = () => fetchPaginatedSchedules(namespace);
+  onMount(() => {
+    if (query) {
+      // Set filters from inital page load query if it exists
+      $scheduleFilters = toListWorkflowFilters(query, $searchAttributes);
+    }
+  });
 
-  let search = '';
-  $: filteredSchedules = (schedules: ScheduleListEntry[]) =>
-    search
-      ? schedules.filter((schedule) =>
-          schedule.scheduleId.toLowerCase().includes(search.toLowerCase()),
-        )
-      : schedules;
+  const onError = (err: APIErrorResponse) => {
+    error = err?.body?.message || translate('schedules.error-message-fetching');
+  };
 </script>
 
-{#key namespace}
+{#key [namespace, query, refresh]}
   <PaginatedTable
     let:visibleItems
     {onFetch}
+    {onError}
     total={$schedulesCount}
     aria-label={translate('common.schedules')}
     pageSizeSelectLabel={translate('common.per-page')}
@@ -52,84 +97,89 @@
     >
 
     <div class="flex flex-col gap-4" slot="header" let:visibleItems>
+      {@const showActions = visibleItems.length || query}
       <h1 class="flex flex-col gap-0 md:flex-row md:items-center md:gap-2">
         <SchedulesCount />
       </h1>
-
-      <div class="flex flex-row flex-wrap justify-between gap-2">
-        {#if visibleItems.length}
-          <div class="w-96">
-            <Input
-              icon="search"
-              type="search"
-              label={translate('schedules.name')}
-              labelHidden
-              id="schedule-name-filter"
-              placeholder={translate('schedules.name')}
-              clearable
-              clearButtonLabel={translate('common.clear-input-button-label')}
-              bind:value={search}
-              on:submit={noop}
-            />
-          </div>
-        {/if}
-        {#if !createDisabled && visibleItems.length}
+      <div class="flex flex-col justify-between gap-2 md:flex-row">
+        {#if showActions}
+          <SearchAttributeFilter
+            bind:filters={$scheduleFilters}
+            options={searchAttributeOptions}
+            refresh={() => {
+              refresh = Date.now();
+            }}
+          />
           <Button
-            data-testid="create-schedule"
-            href={routeForScheduleCreate({ namespace })}
-            disabled={!writeActionsAreAllowed()}
-          >
-            {translate('schedules.create')}
-          </Button>
+            leadingIcon="settings"
+            variant="secondary"
+            on:click={openCustomizationDrawer}
+          />
+          {#if !createDisabled}
+            <Button
+              data-testid="create-schedule"
+              href={routeForScheduleCreate({ namespace })}
+              disabled={!writeActionsAreAllowed()}
+            >
+              {translate('schedules.create')}
+            </Button>
+          {/if}
         {/if}
       </div>
     </div>
 
     <tr slot="headers" class="text-left">
-      <th>{translate('common.status')}</th>
-      <th>{translate('schedules.name')}</th>
-      <th>{translate('common.workflow-type')}</th>
-      <th>{translate('schedules.recent-runs')}</th>
-      <th>{translate('schedules.upcoming-runs')}</th>
-      <th>{translate('schedules.schedule-spec')}</th>
+      {#each columns as { label }}
+        <th>{label}</th>
+      {/each}
     </tr>
-    {#each filteredSchedules(visibleItems) as schedule}
-      <SchedulesTableRow {schedule} />
-    {:else}
-      {#if search}
-        <tr>
-          <td colspan="6">
-            <EmptyState
-              title={translate('schedules.empty-state-title')}
-              content={translate('schedules.empty-state-description')}
-            />
-          </td>
-        </tr>
-      {/if}
+    {#each visibleItems as schedule}
+      <SchedulesTableRow {schedule} {columns} />
     {/each}
 
     <svelte:fragment slot="empty">
-      <EmptyState title={translate('schedules.empty-state-title')}>
-        <p>
-          {translate('schedules.getting-started-docs-link-preface')}
-          <Link newTab href="https://docs.temporal.io/workflows/#schedule"
-            >{translate('schedules.getting-started-docs-link')}</Link
-          >
-          {translate('schedules.getting-started-cli-link-preface')}
-          <Link newTab href="https://docs.temporal.io/cli/schedule"
-            >Temporal CLI</Link
-          >.
-        </p>
-        {#if !createDisabled}
-          <Button
-            data-testid="create-schedule"
-            on:click={() => goto(routeForScheduleCreate({ namespace }))}
-            disabled={!writeActionsAreAllowed()}
-          >
-            {translate('schedules.create')}
-          </Button>
-        {/if}
-      </EmptyState>
+      {#if error}
+        <EmptyState title={translate('schedules.empty-state-title')}>
+          <Alert intent="warning" icon="warning" class="mx-12">
+            {error}
+          </Alert>
+        </EmptyState>
+      {:else if query}
+        <EmptyState
+          title={translate('schedules.empty-state-title')}
+          content={translate('schedules.empty-state-description')}
+        />
+      {:else}
+        <EmptyState title={translate('schedules.empty-state-title')}>
+          <p>
+            {translate('schedules.getting-started-docs-link-preface')}
+            <Link newTab href="https://docs.temporal.io/workflows/#schedule"
+              >{translate('schedules.getting-started-docs-link')}</Link
+            >
+            {translate('schedules.getting-started-cli-link-preface')}
+            <Link newTab href="https://docs.temporal.io/cli/schedule"
+              >Temporal CLI</Link
+            >.
+          </p>
+          {#if !createDisabled}
+            <Button
+              data-testid="create-schedule"
+              on:click={() => goto(routeForScheduleCreate({ namespace }))}
+              disabled={!writeActionsAreAllowed()}
+            >
+              {translate('schedules.create')}
+            </Button>
+          {/if}
+        </EmptyState>
+      {/if}
     </svelte:fragment>
   </PaginatedTable>
 {/key}
+
+<ConfigurableTableHeadersDrawer
+  {availableColumns}
+  bind:open={customizationDrawerOpen}
+  table={TABLE_TYPE.SCHEDULES}
+  type={translate('schedules.schedule')}
+  title={translate('common.schedules')}
+/>
diff --git a/src/lib/pages/start-workflow.svelte b/src/lib/pages/start-workflow.svelte
index 434041bc4..39cf33cfb 100644
--- a/src/lib/pages/start-workflow.svelte
+++ b/src/lib/pages/start-workflow.svelte
@@ -5,7 +5,7 @@
   import { goto } from '$app/navigation';
   import { page } from '$app/stores';
 
-  import StartWorkflowSearchAttributes from '$lib/components/workflow/start-workflow-search-attributes.svelte';
+  import AddSearchAttributes from '$lib/components/workflow/add-search-attributes.svelte';
   import Alert from '$lib/holocene/alert.svelte';
   import Button from '$lib/holocene/button.svelte';
   import CodeBlock from '$lib/holocene/code-block.svelte';
@@ -255,7 +255,7 @@
       </div>
     </div>
     {#if viewAdvancedOptions}
-      <StartWorkflowSearchAttributes bind:attributesToAdd={searchAttributes} />
+      <AddSearchAttributes bind:attributesToAdd={searchAttributes} />
     {/if}
     <div class="mt-4 flex w-full justify-between">
       <Button
diff --git a/src/lib/pages/workflow-metadata.svelte b/src/lib/pages/workflow-metadata.svelte
index a3688614c..7b692e371 100644
--- a/src/lib/pages/workflow-metadata.svelte
+++ b/src/lib/pages/workflow-metadata.svelte
@@ -10,7 +10,9 @@
 <div class="flex flex-col gap-4">
   {#if workflow?.searchAttributes}
     <div class="mt-4 flex flex-col gap-2">
-      <h3>{translate('common.search-attributes')}</h3>
+      <h3>
+        {translate('events.attribute-group.search-attributes')}
+      </h3>
       <div class="h-0.5 rounded-full bg-inverse" />
       <PayloadDecoder
         value={{ searchAttributes: workflow.searchAttributes }}
diff --git a/src/lib/pages/workflows-with-new-search.svelte b/src/lib/pages/workflows-with-new-search.svelte
index e169317cf..f7dc01307 100644
--- a/src/lib/pages/workflows-with-new-search.svelte
+++ b/src/lib/pages/workflows-with-new-search.svelte
@@ -35,19 +35,17 @@
   import BatchTerminateConfirmationModal from '$lib/components/workflow/client-actions/batch-terminate-confirmation-modal.svelte';
   import CancelConfirmationModal from '$lib/components/workflow/client-actions/cancel-confirmation-modal.svelte';
   import TerminateConfirmationModal from '$lib/components/workflow/client-actions/terminate-confirmation-modal.svelte';
-  import WorkflowFilterSearch from '$lib/components/workflow/filter-search/index.svelte';
+  import ConfigurableTableHeadersDrawer from '$lib/components/workflow/configurable-table-headers-drawer/index.svelte';
+  import WorkflowSearchAttributeFilter from '$lib/components/workflow/search-attribute-filter/index.svelte';
   import WorkflowCountRefresh from '$lib/components/workflow/workflow-count-refresh.svelte';
   import WorkflowCounts from '$lib/components/workflow/workflow-counts.svelte';
-  import WorkflowColumnsOrderableList from '$lib/components/workflow/workflows-summary-configurable-table/orderable-list.svelte';
   import WorkflowsSummaryConfigurableTable from '$lib/components/workflow/workflows-summary-configurable-table.svelte';
   import Button from '$lib/holocene/button.svelte';
-  import DrawerContent from '$lib/holocene/drawer-content.svelte';
-  import Drawer from '$lib/holocene/drawer.svelte';
-  import Icon from '$lib/holocene/icon/icon.svelte';
   import { translate } from '$lib/i18n/translate';
   import Translate from '$lib/i18n/translate.svelte';
   import { supportsAdvancedVisibility } from '$lib/stores/advanced-visibility';
   import { groupByCountEnabled } from '$lib/stores/capability-enablement';
+  import { availableWorkflowSystemSearchAttributeColumns } from '$lib/stores/configurable-table-columns';
   import { workflowFilters } from '$lib/stores/filters';
   import { lastUsedNamespace } from '$lib/stores/namespaces';
   import { searchAttributes } from '$lib/stores/search-attributes';
@@ -70,6 +68,11 @@
   $: searchParams = $page.url.searchParams.toString();
   $: searchParams, ($workflowsSearchParams = searchParams);
 
+  $: availableColumns = availableWorkflowSystemSearchAttributeColumns(
+    namespace,
+    $page.data.settings,
+  );
+
   onMount(() => {
     $lastUsedNamespace = $page.params.namespace;
     if (query) {
@@ -164,10 +167,6 @@
   const openCustomizationDrawer = () => {
     customizationDrawerOpen = true;
   };
-
-  const closeCustomizationDrawer = () => {
-    customizationDrawerOpen = false;
-  };
 </script>
 
 <BatchTerminateConfirmationModal
@@ -226,30 +225,15 @@
 </header>
 
 <div class="flex flex-col gap-2 md:flex-row">
-  <WorkflowFilterSearch onClickConfigure={openCustomizationDrawer} />
+  <WorkflowSearchAttributeFilter onClickConfigure={openCustomizationDrawer} />
 </div>
 <WorkflowsSummaryConfigurableTable>
   <slot name="cloud" slot="cloud" />
 </WorkflowsSummaryConfigurableTable>
 
-<Drawer
-  open={customizationDrawerOpen}
-  onClick={closeCustomizationDrawer}
-  position="right"
-  id="workflows-summary-table-configuration-drawer"
-  dark={false}
-  closeButtonLabel={translate('workflows.close-configure-workflows')}
-  class="w-[35vw] min-w-min max-w-fit"
->
-  <DrawerContent title={translate('workflows.configure-workflows')}>
-    <svelte:fragment slot="subtitle">
-      Add (<Icon class="inline" name="add" />), re-arrange (<Icon
-        class="inline"
-        name="chevron-selector-vertical"
-      />), and remove (<Icon class="inline" name="hyphen" />), Workflow Headings
-      to personalize the Workflow List Table.
-    </svelte:fragment>
-
-    <WorkflowColumnsOrderableList {namespace} />
-  </DrawerContent>
-</Drawer>
+<ConfigurableTableHeadersDrawer
+  {availableColumns}
+  bind:open={customizationDrawerOpen}
+  type={translate('common.workflows', { count: 1 })}
+  title={translate('common.workflows', { count: 2 })}
+/>
diff --git a/src/lib/services/schedule-service.ts b/src/lib/services/schedule-service.ts
index 4ea51b71a..411f9a488 100644
--- a/src/lib/services/schedule-service.ts
+++ b/src/lib/services/schedule-service.ts
@@ -33,13 +33,20 @@ type PaginatedSchedulesPromise = (
 
 export const fetchPaginatedSchedules = async (
   namespace: string,
+  query: string,
+  onError: ErrorCallback,
   request = fetch,
 ): Promise<PaginatedSchedulesPromise> => {
   return (pageSize = 100, token = '') => {
     const route = routeForApi('schedules', { namespace });
     return requestFromAPI<ListScheduleResponse>(route, {
-      params: { maximumPageSize: String(pageSize), nextPageToken: token },
+      params: {
+        maximumPageSize: String(pageSize),
+        nextPageToken: token,
+        ...(query ? { query } : {}),
+      },
       request,
+      onError,
     }).then(({ schedules, nextPageToken }) => {
       return {
         items: schedules,
diff --git a/src/lib/services/workflow-service.ts b/src/lib/services/workflow-service.ts
index e0c55007c..aff3060f8 100644
--- a/src/lib/services/workflow-service.ts
+++ b/src/lib/services/workflow-service.ts
@@ -12,7 +12,7 @@ import {
 import { authUser } from '$lib/stores/auth-user';
 import type { SearchAttributeInput } from '$lib/stores/search-attributes';
 import { canFetchChildWorkflows } from '$lib/stores/workflows';
-import type { ResetWorkflowRequest } from '$lib/types';
+import type { ResetWorkflowRequest, SearchAttribute } from '$lib/types';
 import type {
   ValidWorkflowEndpoints,
   ValidWorkflowParameters,
@@ -423,12 +423,12 @@ export async function fetchAllChildWorkflows(
   }
 }
 
-const setSearchAttributes = (
+export const setSearchAttributes = (
   attributes: SearchAttributeInput[],
-): Record<string, Payload> => {
+): SearchAttribute => {
   if (!attributes.length) return {};
 
-  const searchAttributes: Record<string, Payload> = {};
+  const searchAttributes: SearchAttribute = {};
   attributes.forEach((attribute) => {
     searchAttributes[attribute.attribute] = setBase64Payload(attribute.value);
   });
diff --git a/src/lib/stores/workflow-table-columns.test.ts b/src/lib/stores/configurable-table-columns.test.ts
similarity index 89%
rename from src/lib/stores/workflow-table-columns.test.ts
rename to src/lib/stores/configurable-table-columns.test.ts
index aa5685701..12b31d225 100644
--- a/src/lib/stores/workflow-table-columns.test.ts
+++ b/src/lib/stores/configurable-table-columns.test.ts
@@ -8,13 +8,14 @@ import {
   persistedWorkflowTableColumns,
   pinColumn,
   removeColumn,
-} from './workflow-table-columns';
+  TABLE_TYPE,
+} from './configurable-table-columns';
 
 describe('Workflow Table Columns store', () => {
   describe('addColumn', () => {
     test('moves a column from the availableColumns array to the columns array', () => {
       persistedWorkflowTableColumns.set({ default: [] });
-      addColumn('Workflow ID', 'default');
+      addColumn('Workflow ID', 'default', TABLE_TYPE.WORKFLOWS);
       expect(get(persistedWorkflowTableColumns)).toEqual({
         default: [{ label: 'Workflow ID', pinned: false }],
       });
@@ -26,7 +27,7 @@ describe('Workflow Table Columns store', () => {
       persistedWorkflowTableColumns.set({
         default: [{ label: 'Workflow ID', pinned: true }],
       });
-      removeColumn('Workflow ID', 'default');
+      removeColumn('Workflow ID', 'default', TABLE_TYPE.WORKFLOWS);
       expect(get(persistedWorkflowTableColumns)).toEqual({ default: [] });
     });
   });
@@ -39,7 +40,7 @@ describe('Workflow Table Columns store', () => {
           { label: 'Start', pinned: false },
         ],
       });
-      moveColumn(1, 0, 'default');
+      moveColumn(1, 0, 'default', TABLE_TYPE.WORKFLOWS);
       expect(get(persistedWorkflowTableColumns)).toEqual({
         default: [
           { label: 'Start', pinned: true },
@@ -55,7 +56,7 @@ describe('Workflow Table Columns store', () => {
           { label: 'Start', pinned: false },
         ],
       });
-      moveColumn(0, 1, 'default');
+      moveColumn(0, 1, 'default', TABLE_TYPE.WORKFLOWS);
       expect(get(persistedWorkflowTableColumns)).toEqual({
         default: [
           { label: 'Start', pinned: false },
@@ -71,7 +72,7 @@ describe('Workflow Table Columns store', () => {
           { label: 'Start', pinned: true },
         ],
       });
-      moveColumn(1, 0, 'default');
+      moveColumn(1, 0, 'default', TABLE_TYPE.WORKFLOWS);
       expect(get(persistedWorkflowTableColumns)).toEqual({
         default: [
           { label: 'Start', pinned: true },
@@ -87,7 +88,7 @@ describe('Workflow Table Columns store', () => {
           { label: 'Start', pinned: true },
         ],
       });
-      moveColumn(0, 1, 'default');
+      moveColumn(0, 1, 'default', TABLE_TYPE.WORKFLOWS);
       expect(get(persistedWorkflowTableColumns)).toEqual({
         default: [
           { label: 'Start', pinned: true },
@@ -106,7 +107,7 @@ describe('Workflow Table Columns store', () => {
           { label: 'History Length', pinned: false },
         ],
       });
-      moveColumn(4, 0, 'default');
+      moveColumn(4, 0, 'default', TABLE_TYPE.WORKFLOWS);
       expect(get(persistedWorkflowTableColumns)).toEqual({
         default: [
           { label: 'History Length', pinned: true },
@@ -128,7 +129,7 @@ describe('Workflow Table Columns store', () => {
           { label: 'History Length', pinned: false },
         ],
       });
-      moveColumn(0, 4, 'default');
+      moveColumn(0, 4, 'default', TABLE_TYPE.WORKFLOWS);
       expect(get(persistedWorkflowTableColumns)).toEqual({
         default: [
           { label: 'End', pinned: true },
@@ -150,7 +151,7 @@ describe('Workflow Table Columns store', () => {
           { label: 'Run ID', pinned: false },
         ],
       });
-      pinColumn('End', 'default');
+      pinColumn('End', 'default', TABLE_TYPE.WORKFLOWS);
       expect(get(persistedWorkflowTableColumns)).toEqual({
         default: [
           { label: 'Start', pinned: true },
@@ -168,7 +169,7 @@ describe('Workflow Table Columns store', () => {
           { label: 'End', pinned: false },
         ],
       });
-      pinColumn('End', 'default');
+      pinColumn('End', 'default', TABLE_TYPE.WORKFLOWS);
       expect(get(persistedWorkflowTableColumns)).toEqual({
         default: [
           { label: 'Start', pinned: true },
@@ -186,7 +187,7 @@ describe('Workflow Table Columns store', () => {
           { label: 'End', pinned: true },
         ],
       });
-      pinColumn('Start', 'default');
+      pinColumn('Start', 'default', TABLE_TYPE.WORKFLOWS);
       expect(get(persistedWorkflowTableColumns)).toEqual({
         default: [
           { label: 'Run ID', pinned: true },
diff --git a/src/lib/stores/configurable-table-columns.ts b/src/lib/stores/configurable-table-columns.ts
new file mode 100644
index 000000000..7fc8c5498
--- /dev/null
+++ b/src/lib/stores/configurable-table-columns.ts
@@ -0,0 +1,447 @@
+import { derived, type Readable, type Writable } from 'svelte/store';
+
+import { page } from '$app/stores';
+
+import { translate } from '$lib/i18n/translate';
+import type { Settings } from '$lib/types/global';
+
+import { namespaces } from './namespaces';
+import { persistStore } from './persist-store';
+import { customSearchAttributes } from './search-attributes';
+
+export const MAX_PINNED_COLUMNS = 2;
+export const WorkflowHeaderLabels = [
+  'Status',
+  'Workflow ID',
+  'Run ID',
+  'Type',
+  'Start',
+  'End',
+  'History Size',
+  'History Length',
+  'Execution Time',
+  'Execution Duration',
+  'State Transitions',
+  'Parent Namespace',
+  'Task Queue',
+  'Scheduled By ID',
+  'Scheduled Start Time',
+] as const;
+
+export type WorkflowHeaderLabel = (typeof WorkflowHeaderLabels)[number];
+
+// https://github.com/microsoft/TypeScript/issues/29729
+// https://stackoverflow.com/a/61048124
+// eslint-disable-next-line @typescript-eslint/ban-types
+type AnyWorkflowHeaderLabel = WorkflowHeaderLabel | (string & {});
+
+export type ConfigurableTableHeader = {
+  label: AnyWorkflowHeaderLabel;
+  pinned: boolean;
+};
+
+export const TABLE_TYPE = {
+  WORKFLOWS: 'workflows',
+  SCHEDULES: 'schedules',
+} as const;
+
+type Keys = keyof typeof TABLE_TYPE;
+export type ConfigurableTableType = (typeof TABLE_TYPE)[Keys];
+
+type TableColumns = {
+  [namespace: string]:
+    | {
+        [key in ConfigurableTableType]: ConfigurableTableHeader[];
+      }
+    | undefined;
+};
+
+type State = {
+  [namespace: string]: ConfigurableTableHeader[] | undefined;
+};
+
+type Action =
+  | {
+      type: 'CONFIGURABLE_COLUMN.ADD';
+      payload: {
+        label: AnyWorkflowHeaderLabel;
+        namespace: string;
+        table: ConfigurableTableType;
+      };
+    }
+  | {
+      type: 'CONFIGURABLE_COLUMN.REMOVE';
+      payload: {
+        label: AnyWorkflowHeaderLabel;
+        namespace: string;
+        table: ConfigurableTableType;
+      };
+    }
+  | {
+      type: 'CONFIGURABLE_COLUMN.PIN';
+      payload: {
+        label: AnyWorkflowHeaderLabel;
+        namespace: string;
+        table: ConfigurableTableType;
+      };
+    }
+  | {
+      type: 'CONFIGURABLE_COLUMN.MOVE';
+      payload: {
+        from: number;
+        to: number;
+        namespace: string;
+        table: ConfigurableTableType;
+      };
+    };
+
+const DEFAULT_WORKFLOWS_COLUMNS: ConfigurableTableHeader[] = [
+  { label: 'Status', pinned: true },
+  { label: 'Workflow ID', pinned: true },
+  { label: 'Run ID', pinned: false },
+  { label: 'Type', pinned: false },
+  { label: 'Start', pinned: false },
+  { label: 'End', pinned: false },
+];
+
+const DEFAULT_AVAILABLE_WORKFLOWS_COLUMNS: ConfigurableTableHeader[] = [
+  { label: 'History Size', pinned: false },
+  { label: 'History Length', pinned: false },
+  { label: 'Execution Time', pinned: false },
+  { label: 'Execution Duration', pinned: false },
+  { label: 'State Transitions', pinned: false },
+  { label: 'Parent Namespace', pinned: false },
+  { label: 'Task Queue', pinned: false },
+  { label: 'Scheduled By ID', pinned: false },
+  { label: 'Scheduled Start Time', pinned: false },
+];
+
+const DEFAULT_SCHEDULES_COLUMNS: ConfigurableTableHeader[] = [
+  { label: translate('common.status'), pinned: false },
+  { label: translate('schedules.id'), pinned: false },
+  { label: translate('common.workflow-type'), pinned: false },
+  { label: translate('schedules.recent-runs'), pinned: false },
+  { label: translate('schedules.upcoming-runs'), pinned: false },
+  { label: translate('schedules.schedule-spec'), pinned: false },
+];
+
+const isNotParentWorkflowIdColumn = (column: ConfigurableTableHeader) =>
+  column.label !== 'Parent Workflow ID';
+
+const getDefaultWorkflowsTableColumns = (): ConfigurableTableHeader[] => {
+  let columns: ConfigurableTableHeader[];
+  try {
+    // try to get the list of columns that was stored last time they interacted
+    // with the table before we made it namespace-specific
+    const stringifiedOldColumns = window.localStorage.getItem(
+      'workflow-table-columns',
+    );
+    const parsedOldColumns = JSON.parse(stringifiedOldColumns);
+
+    if (stringifiedOldColumns && parsedOldColumns?.length) {
+      const filteredOldColumns = parsedOldColumns.filter(
+        isNotParentWorkflowIdColumn,
+      );
+      columns = filteredOldColumns;
+    } else {
+      columns = DEFAULT_WORKFLOWS_COLUMNS;
+    }
+  } catch {
+    columns = DEFAULT_WORKFLOWS_COLUMNS;
+  }
+
+  return columns;
+};
+
+export const persistedWorkflowTableColumns = persistStore<State>(
+  'namespace-workflow-table-columns',
+  {},
+);
+
+export const persistedSchedulesTableColumns = persistStore<State>(
+  'namespace-schedules-table-columns',
+  {},
+);
+
+export const configurableTableColumns: Readable<TableColumns> = derived(
+  [
+    namespaces,
+    page,
+    persistedWorkflowTableColumns,
+    persistedSchedulesTableColumns,
+  ],
+  ([
+    $namespaces,
+    $page,
+    $persistedWorkflowTableColumns,
+    $persistedSchedulesTableColumns,
+  ]) => {
+    const state: TableColumns = {};
+    const useOrAddDefaultTableColumnsToNamespace = (
+      columns: State,
+      namespace: string,
+      defaultColumns: ConfigurableTableHeader[],
+      update: (columns: State) => void,
+    ) => {
+      if (!columns?.[namespace]?.length) {
+        columns[namespace] = [...defaultColumns];
+        return columns[namespace];
+      }
+      const filteredColumns = columns[namespace].filter(
+        isNotParentWorkflowIdColumn,
+      );
+
+      if (filteredColumns.length !== columns[namespace].length) {
+        columns[namespace] = filteredColumns;
+        update(columns);
+      }
+
+      return columns[namespace];
+    };
+
+    const getTableColumns = (namespace: string) => ({
+      workflows: useOrAddDefaultTableColumnsToNamespace(
+        $persistedWorkflowTableColumns,
+        namespace,
+        getDefaultWorkflowsTableColumns(),
+        (columns) => persistedWorkflowTableColumns.set(columns),
+      ),
+      schedules: useOrAddDefaultTableColumnsToNamespace(
+        $persistedSchedulesTableColumns,
+        namespace,
+        DEFAULT_SCHEDULES_COLUMNS,
+        (columns) => persistedSchedulesTableColumns.set(columns),
+      ),
+    });
+
+    const namespaceColumns =
+      $namespaces?.reduce(
+        (namespaceToColumnsMap, { namespaceInfo: { name } }): TableColumns => {
+          return {
+            ...namespaceToColumnsMap,
+            [name]: getTableColumns(name),
+          };
+        },
+        state,
+      ) ?? {};
+    const { namespace: currentNamespace } = $page.params;
+
+    return namespaceColumns[currentNamespace]
+      ? namespaceColumns
+      : {
+          ...namespaceColumns,
+          [currentNamespace]: getTableColumns(currentNamespace),
+        };
+  },
+);
+
+export const pinnedColumnsWidth = persistStore<number>(
+  'workflow-table-pinned-columns-width',
+);
+
+export const availableWorkflowSystemSearchAttributeColumns: (
+  namespace: string,
+  settings: Settings,
+) => Readable<ConfigurableTableHeader[]> = (namespace, settings) =>
+  derived(configurableTableColumns, ($configurableTableColumns) =>
+    [
+      ...DEFAULT_WORKFLOWS_COLUMNS,
+      ...(settings?.runtimeEnvironment?.isCloud
+        ? DEFAULT_AVAILABLE_WORKFLOWS_COLUMNS.filter(
+            (col) => col.label !== 'Parent Namespace',
+          )
+        : DEFAULT_AVAILABLE_WORKFLOWS_COLUMNS),
+    ].filter(
+      (header) =>
+        !$configurableTableColumns[namespace]?.workflows?.some(
+          (column) => column.label === header.label,
+        ),
+    ),
+  );
+
+export const availableScheduleColumns: (
+  namespace: string,
+) => Readable<ConfigurableTableHeader[]> = (namespace) =>
+  derived(configurableTableColumns, ($configurableTableColumns) =>
+    [...DEFAULT_SCHEDULES_COLUMNS].filter(
+      (header) =>
+        !$configurableTableColumns[namespace]?.schedules?.some(
+          (column) => column.label === header.label,
+        ),
+    ),
+  );
+
+export const availableCustomSearchAttributeColumns: (
+  namespace: string,
+  table?: ConfigurableTableType,
+) => Readable<ConfigurableTableHeader[]> = (
+  namespace: string,
+  table: ConfigurableTableType = TABLE_TYPE.WORKFLOWS,
+) =>
+  derived(
+    [customSearchAttributes, configurableTableColumns],
+    ([$customSearchAttributes, $configurableTableColumns]) =>
+      Object.keys($customSearchAttributes)
+        .filter(
+          (searchAttribute) =>
+            !$configurableTableColumns[namespace]?.[table]?.some(
+              (column) => column.label === searchAttribute,
+            ),
+        )
+        .map((key) => ({
+          label: key,
+          pinned: false,
+        })),
+  );
+
+const getDefaultColumns = (table: ConfigurableTableType) => {
+  switch (table) {
+    case TABLE_TYPE.WORKFLOWS:
+      return DEFAULT_WORKFLOWS_COLUMNS;
+    case TABLE_TYPE.SCHEDULES:
+      return DEFAULT_SCHEDULES_COLUMNS;
+  }
+};
+
+const reducer = (action: Action, state: State): State => {
+  const defaultColumns = getDefaultColumns(action.payload.table);
+  switch (action.type) {
+    case 'CONFIGURABLE_COLUMN.ADD': {
+      const { label, namespace } = action.payload;
+      const columns = state?.[namespace] ?? defaultColumns;
+
+      return {
+        ...state,
+        [namespace]: [...columns, { label, pinned: false }],
+      };
+    }
+    case 'CONFIGURABLE_COLUMN.REMOVE': {
+      const { label: labelToRemove, namespace } = action.payload;
+      const columns = state?.[namespace] ?? defaultColumns;
+
+      return {
+        ...state,
+        [namespace]: columns.filter(({ label }) => label !== labelToRemove),
+      };
+    }
+    case 'CONFIGURABLE_COLUMN.PIN': {
+      const { label: labelToPin, namespace } = action.payload;
+      const columns = state?.[namespace] ?? defaultColumns;
+      const index = columns.findIndex(({ label }) => label === labelToPin);
+
+      const isPinned = columns[index].pinned;
+
+      let lastPinned = -1;
+      for (let i = columns.length - 1; i >= 0; i--) {
+        if (columns[i].pinned) {
+          lastPinned = i;
+          break;
+        }
+      }
+
+      const newColumns = [...columns];
+      newColumns[index].pinned = !isPinned;
+
+      if (index > lastPinned && !isPinned) {
+        newColumns.splice(lastPinned + 1, 0, newColumns.splice(index, 1)[0]);
+      } else if (index < lastPinned && isPinned) {
+        newColumns.splice(lastPinned, 0, newColumns.splice(index, 1)[0]);
+      }
+
+      return {
+        ...state,
+        [namespace]: newColumns,
+      };
+    }
+    case 'CONFIGURABLE_COLUMN.MOVE': {
+      const { from, to, namespace } = action.payload;
+      const columns = state?.[namespace] ?? DEFAULT_WORKFLOWS_COLUMNS;
+      const isPinned = columns[from].pinned;
+
+      let lastPinned = 0;
+      for (let i = columns.length - 1; i >= 0; i--) {
+        if (columns[i].pinned) {
+          lastPinned = i;
+          break;
+        }
+      }
+
+      const tempColumns = [...columns];
+      if (to <= lastPinned && !isPinned) {
+        tempColumns[from].pinned = true;
+      } else if (to > lastPinned && isPinned) {
+        tempColumns[from].pinned = false;
+      }
+
+      tempColumns.splice(to, 0, tempColumns.splice(from, 1)[0]);
+
+      return {
+        ...state,
+        [namespace]: tempColumns.map((c, idx) =>
+          idx > MAX_PINNED_COLUMNS - 1 ? { ...c, pinned: false } : c,
+        ),
+      };
+    }
+    default:
+      return state;
+  }
+};
+
+const getPersistedColumns = (table: ConfigurableTableType): Writable<State> => {
+  switch (table) {
+    case TABLE_TYPE.WORKFLOWS:
+      return persistedWorkflowTableColumns;
+    case TABLE_TYPE.SCHEDULES:
+      return persistedSchedulesTableColumns;
+  }
+};
+
+const dispatch = (action: Action) => {
+  const columns = getPersistedColumns(action.payload.table);
+  columns.update((previousState) => reducer(action, previousState));
+};
+
+export const addColumn = (
+  label: AnyWorkflowHeaderLabel,
+  namespace: string,
+  table: ConfigurableTableType,
+) => {
+  dispatch({
+    type: 'CONFIGURABLE_COLUMN.ADD',
+    payload: { label, namespace, table },
+  });
+};
+
+export const removeColumn = (
+  label: AnyWorkflowHeaderLabel,
+  namespace: string,
+  table: ConfigurableTableType,
+) => {
+  dispatch({
+    type: 'CONFIGURABLE_COLUMN.REMOVE',
+    payload: { label, namespace, table },
+  });
+};
+
+export const moveColumn = (
+  from: number,
+  to: number,
+  namespace: string,
+  table: ConfigurableTableType,
+) => {
+  dispatch({
+    type: 'CONFIGURABLE_COLUMN.MOVE',
+    payload: { from, to, namespace, table },
+  });
+};
+
+export const pinColumn = (
+  label: AnyWorkflowHeaderLabel,
+  namespace: string,
+  table: ConfigurableTableType,
+) => {
+  dispatch({
+    type: 'CONFIGURABLE_COLUMN.PIN',
+    payload: { label, namespace, table },
+  });
+};
diff --git a/src/lib/stores/filters.ts b/src/lib/stores/filters.ts
index 2c6d05691..08692fb92 100644
--- a/src/lib/stores/filters.ts
+++ b/src/lib/stores/filters.ts
@@ -4,7 +4,7 @@ import { derived, get, writable } from 'svelte/store';
 import { page } from '$app/stores';
 
 import { allEventTypeOptions } from '$lib/models/event-history/get-event-categorization';
-import type { WorkflowFilter } from '$lib/models/workflow-filters';
+import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
 import { persistStore } from '$lib/stores/persist-store';
 import type { EventClassification, EventTypeCategory } from '$lib/types/events';
 
@@ -36,7 +36,9 @@ const parameters = derived(
   },
 );
 
-const updateWorkflowFilters: StartStopNotifier<WorkflowFilter[]> = (set) => {
+const updateWorkflowFilters: StartStopNotifier<SearchAttributeFilter[]> = (
+  set,
+) => {
   return parameters.subscribe(({ query }) => {
     if (!query && get(workflowFilters).length) {
       // Clear filters if there is no query
@@ -51,11 +53,27 @@ export const searchInputViewOpen = persistStore<boolean>(
   true,
 );
 
-export const workflowFilters = writable<WorkflowFilter[]>(
+export const workflowFilters = writable<SearchAttributeFilter[]>(
   [],
   updateWorkflowFilters,
 );
 
+const updateScheduleFilters: StartStopNotifier<SearchAttributeFilter[]> = (
+  set,
+) => {
+  return parameters.subscribe(({ query }) => {
+    if (!query && get(scheduleFilters).length) {
+      // Clear filters if there is no query
+      set([]);
+    }
+  });
+};
+
+export const scheduleFilters = writable<SearchAttributeFilter[]>(
+  [],
+  updateScheduleFilters,
+);
+
 const updateEventCategoryFilter: StartStopNotifier<
   EventTypeCategory[] | null
 > = (set) => {
diff --git a/src/lib/stores/schedules.ts b/src/lib/stores/schedules.ts
index 2c13fcc81..4a61e8fd1 100644
--- a/src/lib/stores/schedules.ts
+++ b/src/lib/stores/schedules.ts
@@ -4,6 +4,7 @@ import { goto } from '$app/navigation';
 
 import { translate } from '$lib/i18n/translate';
 import { createSchedule, editSchedule } from '$lib/services/schedule-service';
+import { setSearchAttributes } from '$lib/services/workflow-service';
 import type { Schedule } from '$lib/types';
 import type {
   DescribeFullSchedule,
@@ -80,8 +81,15 @@ export const submitCreateSchedule = async ({
   spec,
   presets,
 }: ScheduleParameterArgs): Promise<void> => {
-  const { namespace, name, workflowId, workflowType, taskQueue, input } =
-    action;
+  const {
+    namespace,
+    name,
+    workflowId,
+    workflowType,
+    taskQueue,
+    input,
+    searchAttributes,
+  } = action;
 
   let payloads;
 
@@ -96,6 +104,14 @@ export const submitCreateSchedule = async ({
 
   const body: DescribeFullSchedule = {
     schedule_id: name.trim(),
+    searchAttributes:
+      searchAttributes.length === 0
+        ? null
+        : {
+            indexedFields: {
+              ...setSearchAttributes(searchAttributes),
+            },
+          },
     schedule: {
       spec: {
         calendar: [],
@@ -140,8 +156,15 @@ export const submitEditSchedule = async (
   schedule: Schedule,
   scheduleId: string,
 ): Promise<void> => {
-  const { namespace, name, workflowId, workflowType, taskQueue, input } =
-    action;
+  const {
+    namespace,
+    name,
+    workflowId,
+    workflowType,
+    taskQueue,
+    input,
+    searchAttributes,
+  } = action;
 
   let payloads;
 
@@ -157,6 +180,14 @@ export const submitEditSchedule = async (
   const { preset } = presets;
   const body: DescribeFullSchedule = {
     schedule_id: scheduleId,
+    searchAttributes:
+      searchAttributes.length === 0
+        ? null
+        : {
+            indexedFields: {
+              ...setSearchAttributes(searchAttributes),
+            },
+          },
     schedule: {
       ...schedule,
       action: {
diff --git a/src/lib/stores/search-attributes.ts b/src/lib/stores/search-attributes.ts
index 42ec705ee..2df989710 100644
--- a/src/lib/stores/search-attributes.ts
+++ b/src/lib/stores/search-attributes.ts
@@ -2,7 +2,7 @@ import { derived, get, type Readable, writable } from 'svelte/store';
 
 import type {
   SearchAttributes,
-  SearchAttributesValue,
+  SearchAttributeType,
   WorkflowExecution,
 } from '$lib/types/workflows';
 
@@ -49,12 +49,14 @@ export const workflowIncludesSearchAttribute = (
 export type SearchAttributeOption = {
   label: string;
   value: string;
-  type: SearchAttributesValue;
+  type: SearchAttributeType;
 };
 
+export type SearchAttributeInputValue = string | number;
+
 export type SearchAttributeInput = {
   attribute: string;
-  value: string;
+  value: SearchAttributeInputValue;
 };
 
 export const searchAttributeOptions: Readable<SearchAttributeOption[]> =
diff --git a/src/lib/stores/workflow-table-columns.ts b/src/lib/stores/workflow-table-columns.ts
deleted file mode 100644
index f9dedbfb5..000000000
--- a/src/lib/stores/workflow-table-columns.ts
+++ /dev/null
@@ -1,319 +0,0 @@
-import { derived, type Readable } from 'svelte/store';
-
-import { page } from '$app/stores';
-
-import type { Settings } from '$lib/types/global';
-
-import { namespaces } from './namespaces';
-import { persistStore } from './persist-store';
-import { customSearchAttributes } from './search-attributes';
-
-export const MAX_PINNED_COLUMNS = 2;
-export const WorkflowHeaderLabels = [
-  'Status',
-  'Workflow ID',
-  'Run ID',
-  'Type',
-  'Start',
-  'End',
-  'History Size',
-  'History Length',
-  'Execution Time',
-  'Execution Duration',
-  'State Transitions',
-  'Parent Namespace',
-  'Task Queue',
-  'Scheduled By ID',
-  'Scheduled Start Time',
-] as const;
-
-export type WorkflowHeaderLabel = (typeof WorkflowHeaderLabels)[number];
-
-// https://github.com/microsoft/TypeScript/issues/29729
-// https://stackoverflow.com/a/61048124
-// eslint-disable-next-line @typescript-eslint/ban-types
-type AnyWorkflowHeaderLabel = WorkflowHeaderLabel | (string & {});
-
-export type WorkflowHeader = {
-  label: AnyWorkflowHeaderLabel;
-  pinned: boolean;
-};
-
-type State = {
-  [namespace: string]: WorkflowHeader[] | undefined;
-};
-
-type Action =
-  | {
-      type: 'WORKFLOW_COLUMN.ADD';
-      payload: { label: AnyWorkflowHeaderLabel; namespace: string };
-    }
-  | {
-      type: 'WORKFLOW_COLUMN.REMOVE';
-      payload: { label: AnyWorkflowHeaderLabel; namespace: string };
-    }
-  | {
-      type: 'WORKFLOW_COLUMN.PIN';
-      payload: { label: AnyWorkflowHeaderLabel; namespace: string };
-    }
-  | {
-      type: 'WORKFLOW_COLUMN.MOVE';
-      payload: { from: number; to: number; namespace: string };
-    };
-
-const DEFAULT_COLUMNS: WorkflowHeader[] = [
-  { label: 'Status', pinned: true },
-  { label: 'Workflow ID', pinned: true },
-  { label: 'Run ID', pinned: false },
-  { label: 'Type', pinned: false },
-  { label: 'Start', pinned: false },
-  { label: 'End', pinned: false },
-];
-
-const DEFAULT_AVAILABLE_COLUMNS: WorkflowHeader[] = [
-  { label: 'History Size', pinned: false },
-  { label: 'History Length', pinned: false },
-  { label: 'Execution Time', pinned: false },
-  { label: 'Execution Duration', pinned: false },
-  { label: 'State Transitions', pinned: false },
-  { label: 'Parent Namespace', pinned: false },
-  { label: 'Task Queue', pinned: false },
-  { label: 'Scheduled By ID', pinned: false },
-  { label: 'Scheduled Start Time', pinned: false },
-];
-
-const isNotParentWorkflowIdColumn = (column: WorkflowHeader) =>
-  column.label !== 'Parent Workflow ID';
-
-export const getDefaultColumns = (): WorkflowHeader[] => {
-  let columns: WorkflowHeader[];
-  try {
-    // try to get the list of columns that was stored last time they interacted
-    // with the table before we made it namespace-specific
-    const stringifiedOldColumns = window.localStorage.getItem(
-      'workflow-table-columns',
-    );
-    const parsedOldColumns = JSON.parse(stringifiedOldColumns);
-
-    if (stringifiedOldColumns && parsedOldColumns?.length) {
-      const filteredOldColumns = parsedOldColumns.filter(
-        isNotParentWorkflowIdColumn,
-      );
-      columns = filteredOldColumns;
-    } else {
-      columns = DEFAULT_COLUMNS;
-    }
-  } catch {
-    columns = DEFAULT_COLUMNS;
-  }
-
-  return columns;
-};
-
-export const persistedWorkflowTableColumns = persistStore<State>(
-  'namespace-workflow-table-columns',
-  {},
-);
-
-export const workflowTableColumns: Readable<State> = derived(
-  [namespaces, page, persistedWorkflowTableColumns],
-  ([$namespaces, $page, $persistedWorkflowTableColumns]) => {
-    const state: State = {};
-
-    const useOrAddDefaultTableColumnsToNamespace = (
-      columns: State,
-      namespace: string,
-    ) => {
-      if (!columns?.[namespace]?.length) {
-        columns[namespace] = [...getDefaultColumns()];
-        return columns[namespace];
-      }
-      const filteredColumns = columns[namespace].filter(
-        isNotParentWorkflowIdColumn,
-      );
-
-      if (filteredColumns.length !== columns[namespace].length) {
-        columns[namespace] = filteredColumns;
-        persistedWorkflowTableColumns.set(columns);
-      }
-
-      return columns[namespace];
-    };
-
-    const namespaceColumns =
-      $namespaces?.reduce(
-        (namespaceToColumnsMap, { namespaceInfo: { name } }) => {
-          return {
-            ...namespaceToColumnsMap,
-            [name]: useOrAddDefaultTableColumnsToNamespace(
-              $persistedWorkflowTableColumns,
-              name,
-            ),
-          };
-        },
-        state,
-      ) ?? {};
-    const { namespace: currentNamespace } = $page.params;
-
-    return namespaceColumns[currentNamespace]
-      ? namespaceColumns
-      : {
-          ...namespaceColumns,
-          [currentNamespace]: useOrAddDefaultTableColumnsToNamespace(
-            $persistedWorkflowTableColumns,
-            currentNamespace,
-          ),
-        };
-  },
-);
-
-export const pinnedColumnsWidth = persistStore<number>(
-  'workflow-table-pinned-columns-width',
-);
-
-export const availableSystemSearchAttributeColumns: (
-  namespace: string,
-  settings: Settings,
-) => Readable<WorkflowHeader[]> = (namespace, settings) =>
-  derived(workflowTableColumns, ($workflowTableColumns) =>
-    [
-      ...DEFAULT_COLUMNS,
-      ...(settings?.runtimeEnvironment?.isCloud
-        ? DEFAULT_AVAILABLE_COLUMNS.filter(
-            (col) => col.label !== 'Parent Namespace',
-          )
-        : DEFAULT_AVAILABLE_COLUMNS),
-    ].filter(
-      (header) =>
-        !$workflowTableColumns[namespace]?.some(
-          (column) => column.label === header.label,
-        ),
-    ),
-  );
-
-export const availableCustomSearchAttributeColumns: (
-  namespace: string,
-) => Readable<WorkflowHeader[]> = (namespace: string) =>
-  derived(
-    [customSearchAttributes, workflowTableColumns],
-    ([$customSearchAttributes, $workflowTableColumns]) =>
-      Object.keys($customSearchAttributes)
-        .filter(
-          (searchAttribute) =>
-            !$workflowTableColumns[namespace]?.some(
-              (column) => column.label === searchAttribute,
-            ),
-        )
-        .map((key) => ({
-          label: key,
-          pinned: false,
-        })),
-  );
-
-const reducer = (action: Action, state: State): State => {
-  switch (action.type) {
-    case 'WORKFLOW_COLUMN.ADD': {
-      const { label, namespace } = action.payload;
-      const columns = state?.[namespace] ?? DEFAULT_COLUMNS;
-
-      return {
-        ...state,
-        [namespace]: [...columns, { label, pinned: false }],
-      };
-    }
-    case 'WORKFLOW_COLUMN.REMOVE': {
-      const { label: labelToRemove, namespace } = action.payload;
-      const columns = state?.[namespace] ?? DEFAULT_COLUMNS;
-
-      return {
-        ...state,
-        [namespace]: columns.filter(({ label }) => label !== labelToRemove),
-      };
-    }
-    case 'WORKFLOW_COLUMN.PIN': {
-      const { label: labelToPin, namespace } = action.payload;
-      const columns = state?.[namespace] ?? DEFAULT_COLUMNS;
-      const index = columns.findIndex(({ label }) => label === labelToPin);
-
-      const isPinned = columns[index].pinned;
-
-      let lastPinned = -1;
-      for (let i = columns.length - 1; i >= 0; i--) {
-        if (columns[i].pinned) {
-          lastPinned = i;
-          break;
-        }
-      }
-
-      const newColumns = [...columns];
-      newColumns[index].pinned = !isPinned;
-
-      if (index > lastPinned && !isPinned) {
-        newColumns.splice(lastPinned + 1, 0, newColumns.splice(index, 1)[0]);
-      } else if (index < lastPinned && isPinned) {
-        newColumns.splice(lastPinned, 0, newColumns.splice(index, 1)[0]);
-      }
-
-      return {
-        ...state,
-        [namespace]: newColumns,
-      };
-    }
-    case 'WORKFLOW_COLUMN.MOVE': {
-      const { from, to, namespace } = action.payload;
-      const columns = state?.[namespace] ?? DEFAULT_COLUMNS;
-      const isPinned = columns[from].pinned;
-
-      let lastPinned = 0;
-      for (let i = columns.length - 1; i >= 0; i--) {
-        if (columns[i].pinned) {
-          lastPinned = i;
-          break;
-        }
-      }
-
-      const tempColumns = [...columns];
-      if (to <= lastPinned && !isPinned) {
-        tempColumns[from].pinned = true;
-      } else if (to > lastPinned && isPinned) {
-        tempColumns[from].pinned = false;
-      }
-
-      tempColumns.splice(to, 0, tempColumns.splice(from, 1)[0]);
-
-      return {
-        ...state,
-        [namespace]: tempColumns.map((c, idx) =>
-          idx > MAX_PINNED_COLUMNS - 1 ? { ...c, pinned: false } : c,
-        ),
-      };
-    }
-    default:
-      return state;
-  }
-};
-
-const dispatch = (action: Action) => {
-  persistedWorkflowTableColumns.update((previousState) =>
-    reducer(action, previousState),
-  );
-};
-
-export const addColumn = (label: AnyWorkflowHeaderLabel, namespace: string) => {
-  dispatch({ type: 'WORKFLOW_COLUMN.ADD', payload: { label, namespace } });
-};
-
-export const removeColumn = (
-  label: AnyWorkflowHeaderLabel,
-  namespace: string,
-) => {
-  dispatch({ type: 'WORKFLOW_COLUMN.REMOVE', payload: { label, namespace } });
-};
-
-export const moveColumn = (from: number, to: number, namespace: string) => {
-  dispatch({ type: 'WORKFLOW_COLUMN.MOVE', payload: { from, to, namespace } });
-};
-
-export const pinColumn = (label: AnyWorkflowHeaderLabel, namespace: string) => {
-  dispatch({ type: 'WORKFLOW_COLUMN.PIN', payload: { label, namespace } });
-};
diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts
index f504e48fc..7390ca726 100644
--- a/src/lib/types/index.ts
+++ b/src/lib/types/index.ts
@@ -163,6 +163,7 @@ export type WorkflowExecutionInfo =
   temporal.api.workflow.v1.IWorkflowExecutionInfo;
 export type WorkflowVersionTimpstamp =
   temporal.api.common.v1.IWorkerVersionStamp;
+export type SearchAttribute = temporal.api.common.v1.ISearchAttributes;
 
 // api response
 export type Payload = temporal.api.common.v1.IPayload;
diff --git a/src/lib/types/schedule.ts b/src/lib/types/schedule.ts
index 50b70d581..932989948 100644
--- a/src/lib/types/schedule.ts
+++ b/src/lib/types/schedule.ts
@@ -1,3 +1,4 @@
+import type { SearchAttributeInput } from '$lib/stores/search-attributes';
 import type {
   CalendarSpec,
   DescribeScheduleResponse,
@@ -37,6 +38,7 @@ export type ScheduleActionParameters = {
   workflowId: string;
   taskQueue: string;
   input: string;
+  searchAttributes: SearchAttributeInput[];
 };
 
 export type ScheduleSpecParameters = {
@@ -48,6 +50,7 @@ export type ScheduleSpecParameters = {
   second: string;
   phase: string;
   cronString: string;
+  searchAttributes: SearchAttributeInput[];
 };
 
 // For UI Only
diff --git a/src/lib/types/workflows.ts b/src/lib/types/workflows.ts
index 0f7ff2dd8..392d447b0 100644
--- a/src/lib/types/workflows.ts
+++ b/src/lib/types/workflows.ts
@@ -89,22 +89,27 @@ export type ArchiveFilterParameters = Omit<FilterParameters, 'timeRange'> & {
 
 export type WorkflowIdentifier = import('$lib/types').WorkflowExecutionInput;
 
-export type SearchAttributesValue =
-  | 'Bool'
-  | 'Datetime'
-  | 'Double'
-  | 'Int'
-  | 'Keyword'
-  | 'Text'
-  | 'KeywordList';
+export const SEARCH_ATTRIBUTE_TYPE = {
+  BOOL: 'Bool',
+  DATETIME: 'Datetime',
+  DOUBLE: 'Double',
+  INT: 'Int',
+  KEYWORD: 'Keyword',
+  TEXT: 'Text',
+  KEYWORDLIST: 'KeywordList',
+  UNSPECIFIED: 'Unspecified',
+} as const;
+
+type Keys = keyof typeof SEARCH_ATTRIBUTE_TYPE;
+export type SearchAttributeType = (typeof SEARCH_ATTRIBUTE_TYPE)[Keys];
 
 export type SearchAttributes = {
-  [k: string]: SearchAttributesValue;
+  [k: string]: SearchAttributeType;
 };
 
 export type SearchAttributesResponse = {
-  customAttributes: Record<string, SearchAttributesValue>;
-  systemAttributes: Record<string, SearchAttributesValue>;
+  customAttributes: Record<string, SearchAttributeType>;
+  systemAttributes: Record<string, SearchAttributeType>;
   storageSchema: import('$lib/types').ListSearchAttributesResponse['storageSchema'];
 };
 
diff --git a/src/lib/utilities/query/filter-workflow-query.ts b/src/lib/utilities/query/filter-workflow-query.ts
index d9bb619f1..70fa08833 100644
--- a/src/lib/utilities/query/filter-workflow-query.ts
+++ b/src/lib/utilities/query/filter-workflow-query.ts
@@ -1,10 +1,11 @@
 import { get } from 'svelte/store';
 
-import type { WorkflowFilter } from '$lib/models/workflow-filters';
+import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
 import { supportsAdvancedVisibility } from '$lib/stores/advanced-visibility';
-import type {
-  SearchAttributes,
-  SearchAttributesValue,
+import {
+  SEARCH_ATTRIBUTE_TYPE,
+  type SearchAttributes,
+  type SearchAttributeType,
 } from '$lib/types/workflows';
 
 import { isNullConditional, isStartsWith } from '../is';
@@ -41,9 +42,9 @@ const isValid = (value: unknown, conditional: string): boolean => {
 
 const formatValue = (
   value: string,
-  type: SearchAttributesValue,
+  type: SearchAttributeType,
 ): string | boolean => {
-  if (type === 'Bool') {
+  if (type === SEARCH_ATTRIBUTE_TYPE.BOOL) {
     return value.toLowerCase() === 'true' ? true : false;
   }
   return `"${value}"`;
@@ -59,7 +60,7 @@ const getQueryKey = (attribute: string | number) => {
 
 const toFilterQueryStatement = (
   attribute: keyof SearchAttributes,
-  type: SearchAttributesValue,
+  type: SearchAttributeType,
   value: FilterValue,
   conditional = '=',
   archived: boolean,
@@ -93,7 +94,7 @@ const toFilterQueryStatement = (
 };
 
 const toQueryStatementsFromFilters = (
-  filters: WorkflowFilter[],
+  filters: SearchAttributeFilter[],
   archived: boolean,
 ): string[] => {
   return filters
@@ -132,7 +133,7 @@ const toQueryStatementsFromFilters = (
 };
 
 export const toListWorkflowQueryFromFilters = (
-  filters: WorkflowFilter[] = [],
+  filters: SearchAttributeFilter[] = [],
   archived = false,
 ): string => {
   return toQueryStatementsFromFilters(filters, archived).join('');
diff --git a/src/lib/utilities/query/filter-search.test.ts b/src/lib/utilities/query/search-attribute-filter.test.ts
similarity index 99%
rename from src/lib/utilities/query/filter-search.test.ts
rename to src/lib/utilities/query/search-attribute-filter.test.ts
index 4c2a64e8a..be0779843 100644
--- a/src/lib/utilities/query/filter-search.test.ts
+++ b/src/lib/utilities/query/search-attribute-filter.test.ts
@@ -12,7 +12,7 @@ import {
   isNumberFilter,
   isStatusFilter,
   isTextFilter,
-} from './filter-search';
+} from './search-attribute-filter';
 
 const store = writable<SearchAttributes>({
   BuildIds: 'KeywordList',
diff --git a/src/lib/utilities/query/filter-search.ts b/src/lib/utilities/query/search-attribute-filter.ts
similarity index 64%
rename from src/lib/utilities/query/filter-search.ts
rename to src/lib/utilities/query/search-attribute-filter.ts
index 075df3d02..59ced65c1 100644
--- a/src/lib/utilities/query/filter-search.ts
+++ b/src/lib/utilities/query/search-attribute-filter.ts
@@ -1,7 +1,10 @@
 import { get } from 'svelte/store';
 
 import { searchAttributes } from '$lib/stores/search-attributes';
-import type { SearchAttributesValue } from '$lib/types/workflows';
+import {
+  SEARCH_ATTRIBUTE_TYPE,
+  type SearchAttributeType,
+} from '$lib/types/workflows';
 
 export function isStatusFilter(attribute: string) {
   return attribute === 'ExecutionStatus';
@@ -9,7 +12,7 @@ export function isStatusFilter(attribute: string) {
 
 type FilterAttributeAndType = {
   attribute: string;
-  type?: SearchAttributesValue;
+  type?: SearchAttributeType;
 };
 
 export function isTextFilter(
@@ -17,30 +20,37 @@ export function isTextFilter(
   attributes = searchAttributes,
 ) {
   if (isStatusFilter(attribute)) return false;
-  if (type === 'Keyword') return true;
+  if (type === SEARCH_ATTRIBUTE_TYPE.KEYWORD) return true;
 
   const searchAttributeType = get(attributes)[attribute];
-  return ['Keyword', 'Text', 'String'].includes(searchAttributeType);
+  return [
+    SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+    SEARCH_ATTRIBUTE_TYPE.TEXT,
+    'String',
+  ].includes(searchAttributeType);
 }
 
 export function isListFilter(
   { attribute, type }: FilterAttributeAndType,
   attributes = searchAttributes,
 ) {
-  if (type === 'KeywordList') return true;
+  if (type === SEARCH_ATTRIBUTE_TYPE.KEYWORDLIST) return true;
 
   const searchAttributeType = get(attributes)[attribute];
-  return searchAttributeType === 'KeywordList';
+  return searchAttributeType === SEARCH_ATTRIBUTE_TYPE.KEYWORDLIST;
 }
 
 export function isNumberFilter(
   { attribute, type }: FilterAttributeAndType,
   attributes = searchAttributes,
 ) {
-  if (type === 'Int') return true;
+  if (type === SEARCH_ATTRIBUTE_TYPE.INT) return true;
 
   const searchAttributeType = get(attributes)[attribute];
-  return ['Int', 'Double'].includes(searchAttributeType);
+  return (
+    searchAttributeType === SEARCH_ATTRIBUTE_TYPE.INT ||
+    searchAttributeType === SEARCH_ATTRIBUTE_TYPE.DOUBLE
+  );
 }
 
 export function isDurationFilter(attribute: string) {
@@ -51,20 +61,20 @@ export function isDateTimeFilter(
   { attribute, type }: FilterAttributeAndType,
   attributes = searchAttributes,
 ) {
-  if (type === 'Datetime') return true;
+  if (type === SEARCH_ATTRIBUTE_TYPE.DATETIME) return true;
 
   const searchAttributeType = get(attributes)[attribute];
-  return searchAttributeType === 'Datetime';
+  return searchAttributeType === SEARCH_ATTRIBUTE_TYPE.DATETIME;
 }
 
 export function isBooleanFilter(
   { attribute, type }: FilterAttributeAndType,
   attributes = searchAttributes,
 ) {
-  if (type === 'Bool') return true;
+  if (type === SEARCH_ATTRIBUTE_TYPE.BOOL) return true;
 
   const searchAttributeType = get(attributes)[attribute];
-  return searchAttributeType === 'Bool';
+  return searchAttributeType === SEARCH_ATTRIBUTE_TYPE.BOOL;
 }
 
 export function getFocusedElementId({
@@ -80,7 +90,7 @@ export function getFocusedElementId({
   )
     return 'conditional-menu-button';
 
-  if (isListFilter({ attribute, type })) return 'list-filter-search';
+  if (isListFilter({ attribute, type })) return 'list-filter';
 
   if (isBooleanFilter({ attribute, type })) return 'boolean-filter';
 
diff --git a/src/lib/utilities/query/to-list-workflow-filters.ts b/src/lib/utilities/query/to-list-workflow-filters.ts
index f8909daad..d5f7e6877 100644
--- a/src/lib/utilities/query/to-list-workflow-filters.ts
+++ b/src/lib/utilities/query/to-list-workflow-filters.ts
@@ -1,8 +1,12 @@
 import debounce from 'just-debounce';
 
-import type { WorkflowFilter } from '$lib/models/workflow-filters';
+import type { SearchAttributeFilter } from '$lib/models/search-attribute-filters';
 import { currentPageKey } from '$lib/stores/pagination';
-import type { FilterParameters, SearchAttributes } from '$lib/types/workflows';
+import {
+  type FilterParameters,
+  SEARCH_ATTRIBUTE_TYPE,
+  type SearchAttributes,
+} from '$lib/types/workflows';
 import { toListWorkflowQueryFromFilters } from '$lib/utilities/query/filter-workflow-query';
 
 import { tokenize } from './tokenize';
@@ -47,12 +51,12 @@ export const getLargestDurationUnit = (duration: Duration): Duration => {
   }
 };
 
-const isDatetimeStatement = is('Datetime');
-const isBoolStatement = is('Bool');
+const isDatetimeStatement = is(SEARCH_ATTRIBUTE_TYPE.DATETIME);
+const isBoolStatement = is(SEARCH_ATTRIBUTE_TYPE.BOOL);
 
-export const emptyFilter = (): WorkflowFilter => ({
+export const emptyFilter = (): SearchAttributeFilter => ({
   attribute: '',
-  type: 'Keyword',
+  type: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
   value: '',
   operator: '',
   parenthesis: '',
@@ -60,20 +64,20 @@ export const emptyFilter = (): WorkflowFilter => ({
 });
 
 const DefaultAttributes: SearchAttributes = {
-  ExecutionStatus: 'Keyword',
-  StartTime: 'Datetime',
-  CloseTime: 'Datetime',
-  WorkflowId: 'Keyword',
-  WorkflowType: 'Keyword',
-  RunId: 'Keyword',
+  ExecutionStatus: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+  StartTime: SEARCH_ATTRIBUTE_TYPE.DATETIME,
+  CloseTime: SEARCH_ATTRIBUTE_TYPE.DATETIME,
+  WorkflowId: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+  WorkflowType: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+  RunId: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
 };
 
 export const toListWorkflowFilters = (
   query: string,
   attributes: SearchAttributes = DefaultAttributes,
-): WorkflowFilter[] => {
+): SearchAttributeFilter[] => {
   const tokens = tokenize(query);
-  const filters: WorkflowFilter[] = [];
+  const filters: SearchAttributeFilter[] = [];
   let filter = emptyFilter();
 
   if (!query) {
@@ -153,7 +157,7 @@ export const toListWorkflowFilters = (
   }
 };
 
-export const combineDropdownFilters = (filters: WorkflowFilter[]) => {
+export const combineDropdownFilters = (filters: SearchAttributeFilter[]) => {
   const statusFilters = filters.filter(
     (f) => f.attribute === 'ExecutionStatus' && f.value,
   );
@@ -194,7 +198,7 @@ export const combineDropdownFilters = (filters: WorkflowFilter[]) => {
   ];
 };
 
-export const combineFilters = (filters: WorkflowFilter[]) => {
+export const combineFilters = (filters: SearchAttributeFilter[]) => {
   filters.forEach((filter, index) => {
     const previousFilter = filters[index - 1];
     if (previousFilter && !previousFilter.operator) {
@@ -224,7 +228,7 @@ export const combineFilters = (filters: WorkflowFilter[]) => {
 };
 
 export const updateQueryParamsFromFilter = debounce(
-  (url: URL, filters: WorkflowFilter[], isDropdownFilter = false) => {
+  (url: URL, filters: SearchAttributeFilter[], isDropdownFilter = false) => {
     const allFilters = isDropdownFilter
       ? combineDropdownFilters(filters)
       : combineFilters(filters);
diff --git a/src/lib/utilities/screaming-enums.ts b/src/lib/utilities/screaming-enums.ts
index c1a092c56..080a6d992 100644
--- a/src/lib/utilities/screaming-enums.ts
+++ b/src/lib/utilities/screaming-enums.ts
@@ -7,7 +7,7 @@ import type {
 } from '$lib/types';
 import type { BatchOperationState, BatchOperationType } from '$lib/types/batch';
 import type {
-  SearchAttributesValue,
+  SearchAttributeType,
   WorkflowStatus,
   WorkflowTaskFailedCause,
 } from '$lib/types/workflows';
@@ -31,8 +31,8 @@ export const fromScreamingEnum = <T>(
 };
 
 export const toSearchAttributeTypeReadable = (
-  status: SearchAttributesValue,
-): SearchAttributesValue => {
+  status: SearchAttributeType,
+): SearchAttributeType => {
   return fromScreamingEnum(status, 'IndexedValueType');
 };
 
diff --git a/tests/e2e/schedules.spec.ts b/tests/e2e/schedules.spec.ts
index 31a4880b2..4d1f18846 100644
--- a/tests/e2e/schedules.spec.ts
+++ b/tests/e2e/schedules.spec.ts
@@ -17,19 +17,19 @@ test.describe('Schedules Page', () => {
     await createScheduleButton.click();
     await expect(page).toHaveURL(/create/);
 
-    await page.getByLabel('Name*').type('e2e-schedule-1');
-    await page.getByLabel('Workflow Type*').type('test-type-e2e');
-    await page.getByLabel('Workflow Id*').type('e2e-1234');
-    await page.getByLabel('Task Queue*').type('default');
-    await page.locator('#schedule-input').getByRole('textbox').type('abc');
-    await page.getByRole('textbox', { name: 'hrs' }).type('1');
+    await page.getByTestId('name').fill('e2e-schedule-1');
+    await page.getByTestId('workflowType').fill('test-type-e2e');
+    await page.getByTestId('workflowId').fill('e2e-1234');
+    await page.getByTestId('taskQueue').fill('default');
+    await page.locator('#schedule-input').getByRole('textbox').fill('abc');
+    await page.getByRole('textbox', { name: 'hrs' }).fill('1');
     const createSchedule = page.getByRole('button', {
       name: 'Create Schedule',
     });
     await expect(createSchedule).toBeDisabled();
 
     await page.locator('#schedule-input').getByRole('textbox').clear();
-    await page.locator('#schedule-input').getByRole('textbox').type('123');
+    await page.locator('#schedule-input').getByRole('textbox').fill('123');
     await expect(createSchedule).toBeEnabled();
   });
 });
diff --git a/tests/e2e/workflows-summary-table-configuration.spec.ts b/tests/e2e/workflows-summary-table-configuration.spec.ts
index 0e4b4cfec..df5f44563 100644
--- a/tests/e2e/workflows-summary-table-configuration.spec.ts
+++ b/tests/e2e/workflows-summary-table-configuration.spec.ts
@@ -121,7 +121,7 @@ test.describe('Workflows Table Configuration', () => {
       .click();
 
     await expect(
-      page.locator('#workflows-summary-table-configuration-drawer'),
+      page.locator('#workflows-table-configuration-drawer'),
     ).toBeVisible();
 
     for (let i = 0; i < 3; i++) {
@@ -164,7 +164,7 @@ test.describe('Workflows Table Configuration', () => {
       .click();
 
     await expect(
-      page.locator('#workflows-summary-table-configuration-drawer'),
+      page.locator('#workflows-table-configuration-drawer'),
     ).toBeVisible();
 
     const sourceElement = page.getByTestId('orderable-list-item-Run ID');
diff --git a/tests/integration/filter-search.spec.ts b/tests/integration/workflows-search-attribute-filter.spec.ts
similarity index 100%
rename from tests/integration/filter-search.spec.ts
rename to tests/integration/workflows-search-attribute-filter.spec.ts
diff --git a/tests/test-utilities/mocks/search-attributes.ts b/tests/test-utilities/mocks/search-attributes.ts
index 8e5d7e08f..602ed17de 100644
--- a/tests/test-utilities/mocks/search-attributes.ts
+++ b/tests/test-utilities/mocks/search-attributes.ts
@@ -1,34 +1,37 @@
 import type { Page } from '@playwright/test';
 
-import type { SearchAttributesResponse } from '$src/lib/types/workflows';
+import {
+  SEARCH_ATTRIBUTE_TYPE,
+  type SearchAttributesResponse,
+} from '$src/lib/types/workflows';
 
 export const SEARCH_ATTRIBUTES_API =
   '**/api/v1/namespaces/*/search-attributes?';
 
 const MOCK_SEARCH_ATTRIBUTES: SearchAttributesResponse = {
   systemAttributes: {
-    BatcherNamespace: 'Keyword',
-    BatcherUser: 'Keyword',
-    BinaryChecksums: 'Keyword',
-    CloseTime: 'Datetime',
-    CustomBoolField: 'Bool',
-    CustomDatetimeField: 'Datetime',
-    CustomDoubleField: 'Double',
-    CustomIntField: 'Int',
-    CustomKeywordField: 'Keyword',
-    CustomStringField: 'Text',
-    CustomTextField: 'Text',
-    ExecutionDuration: 'Int',
-    ExecutionStatus: 'Keyword',
-    ExecutionTime: 'Datetime',
-    HistoryLength: 'Int',
-    RunId: 'Keyword',
-    StartTime: 'Datetime',
-    StateTransitionCount: 'Int',
-    TaskQueue: 'Keyword',
-    TemporalChangeVersion: 'Keyword',
-    WorkflowId: 'Keyword',
-    WorkflowType: 'Keyword',
+    BatcherNamespace: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+    BatcherUser: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+    BinaryChecksums: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+    CloseTime: SEARCH_ATTRIBUTE_TYPE.DATETIME,
+    CustomBoolField: SEARCH_ATTRIBUTE_TYPE.BOOL,
+    CustomDatetimeField: SEARCH_ATTRIBUTE_TYPE.DATETIME,
+    CustomDoubleField: SEARCH_ATTRIBUTE_TYPE.DOUBLE,
+    CustomIntField: SEARCH_ATTRIBUTE_TYPE.INT,
+    CustomKeywordField: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+    CustomStringField: SEARCH_ATTRIBUTE_TYPE.TEXT,
+    CustomTextField: SEARCH_ATTRIBUTE_TYPE.TEXT,
+    ExecutionDuration: SEARCH_ATTRIBUTE_TYPE.INT,
+    ExecutionStatus: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+    ExecutionTime: SEARCH_ATTRIBUTE_TYPE.DATETIME,
+    HistoryLength: SEARCH_ATTRIBUTE_TYPE.INT,
+    RunId: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+    StartTime: SEARCH_ATTRIBUTE_TYPE.DATETIME,
+    StateTransitionCount: SEARCH_ATTRIBUTE_TYPE.INT,
+    TaskQueue: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+    TemporalChangeVersion: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+    WorkflowId: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
+    WorkflowType: SEARCH_ATTRIBUTE_TYPE.KEYWORD,
   },
   customAttributes: {},
   storageSchema: {},