diff --git a/lilac/formats/openai_json.py b/lilac/formats/openai_json.py
index 3b861daec..47a198047 100644
--- a/lilac/formats/openai_json.py
+++ b/lilac/formats/openai_json.py
@@ -32,7 +32,7 @@ class OpenAIJSON(DatasetFormat):
   Taken from: https://platform.openai.com/docs/api-reference/chat
   """
 
-  name: ClassVar[str] = 'openai_json'
+  name: ClassVar[str] = 'OpenAI JSON'
   data_schema: Schema = schema(
     {
       'messages': [
@@ -88,7 +88,7 @@ class OpenAIConversationJSON(DatasetFormat):
   Note that here "messages" is "conversation" for support with common datasets.
   """
 
-  name: ClassVar[str] = 'openai_conversation_json'
+  name: ClassVar[str] = 'OpenAI Conversation JSON'
   data_schema: Schema = schema(
     {
       'conversation': [
diff --git a/lilac/formats/openchat.py b/lilac/formats/openchat.py
index 815268e0d..9bee2ee32 100644
--- a/lilac/formats/openchat.py
+++ b/lilac/formats/openchat.py
@@ -10,7 +10,7 @@
 class OpenChat(DatasetFormat):
   """OpenChat format."""
 
-  name: ClassVar[str] = 'openchat'
+  name: ClassVar[str] = 'OpenChat'
   data_schema: Schema = schema(
     {
       'items': [
diff --git a/lilac/formats/sharegpt.py b/lilac/formats/sharegpt.py
index 49a6b1038..30134205d 100644
--- a/lilac/formats/sharegpt.py
+++ b/lilac/formats/sharegpt.py
@@ -37,7 +37,7 @@ def _sharegpt_selector(item: Item, conv_from: str) -> str:
 class ShareGPT(DatasetFormat):
   """ShareGPT format."""
 
-  name: ClassVar[str] = 'sharegpt'
+  name: ClassVar[str] = 'ShareGPT'
   data_schema: Schema = schema(
     {
       'conversations': [
diff --git a/lilac/router_dataset_signals.py b/lilac/router_dataset_signals.py
index b20455a60..700668752 100644
--- a/lilac/router_dataset_signals.py
+++ b/lilac/router_dataset_signals.py
@@ -7,7 +7,6 @@
 from pydantic import Field as PydanticField
 
 from .auth import UserInfo, get_session_user, get_user_access
-from .config import ClusterInputSelectorConfig
 from .dataset_format import DatasetFormatInputSelector, get_dataset_format_cls
 from .db_manager import get_dataset
 from .router_utils import RouteErrorHandler
@@ -85,7 +84,7 @@ class ClusterOptions(BaseModel):
   """The request for the cluster endpoint."""
 
   input: Optional[Path] = None
-  input_selector: Optional[ClusterInputSelectorConfig] = None
+  input_selector: Optional[str] = None
 
   output_path: Optional[Path] = None
   use_garden: bool = PydanticField(
@@ -111,9 +110,6 @@ def cluster(
   if not get_user_access(user).dataset.compute_signals:
     raise HTTPException(401, 'User does not have access to compute clusters over this dataset.')
 
-  if options.input is None and options.input_selector is None:
-    raise HTTPException(400, 'Either input or input_selector must be provided.')
-
   dataset = get_dataset(namespace, dataset_name)
   manifest = dataset.manifest()
 
@@ -129,21 +125,15 @@ def cluster(
 
     format_cls = get_dataset_format_cls(dataset_format.name)
     if format_cls is None:
-      raise ValueError(f'Unknown format: {c.input_selector.format}')
+      raise ValueError(f'Unknown format: {dataset_format.name}')
 
-    format = format_cls()
-    if format != manifest.dataset_format:
-      raise ValueError(
-        f'Cluster input format {c.input_selector.format} does not match '
-        f'dataset format {manifest.dataset_format}'
-      )
-
-    cluster_input = format_cls.input_selectors[c.input_selector.selector]
+    cluster_input = format_cls.input_selectors[options.input_selector]
 
     task_name = (
-      f'[{namespace}/{dataset_name}] Clustering using input selector '
-      f'"{options.input_selector.selector}"'
+      f'[{namespace}/{dataset_name}] Clustering using input selector ' f'"{options.input_selector}"'
     )
+  else:
+    raise HTTPException(400, 'Either input or input_selector must be provided.')
 
   task_id = get_task_manager().task_id(name=task_name)
 
diff --git a/web/blueprint/src/lib/components/ComputeClusterModal.svelte b/web/blueprint/src/lib/components/ComputeClusterModal.svelte
index 5856b28ff..1be5de9d9 100644
--- a/web/blueprint/src/lib/components/ComputeClusterModal.svelte
+++ b/web/blueprint/src/lib/components/ComputeClusterModal.svelte
@@ -18,7 +18,11 @@
 </script>
 
 <script lang="ts">
-  import {clusterMutation, queryFormatSelectors} from '$lib/queries/datasetQueries';
+  import {
+    clusterMutation,
+    queryDatasetManifest,
+    queryFormatSelectors
+  } from '$lib/queries/datasetQueries';
   import {queryAuthInfo} from '$lib/queries/serverQueries';
   import {serializePath, type Path} from '$lilac';
   import {
@@ -39,12 +43,17 @@
   $: canComputeRemotely = $authInfo.data?.access.dataset.execute_remotely;
 
   $: formatSelectorsQuery =
-    options != null ? queryFormatSelectors(options?.namespace, options?.datasetName) : null;
-
-  let selectedFormatSelector: string | undefined = undefined;
+    options != null ? queryFormatSelectors(options.namespace, options.datasetName) : null;
+  $: datasetManifest =
+    options != null ? queryDatasetManifest(options.namespace, options.datasetName) : null;
+  let selectedFormatSelector = 'none';
   let formatSelectors: string[] | undefined = undefined;
   let outputColumn: string | undefined = undefined;
-  $: outputColumnRequired = formatSelectors != null;
+  $: outputColumnRequired =
+    formatSelectors != null &&
+    formatSelectors.length > 0 &&
+    selectedFormatSelector != null &&
+    selectedFormatSelector != 'none';
   $: {
     if (options?.output_path != null) {
       outputColumn = serializePath(options.output_path);
@@ -56,7 +65,6 @@
       $formatSelectorsQuery != null &&
       $formatSelectorsQuery.data != null
     ) {
-      selectedFormatSelector = $formatSelectorsQuery.data[0];
       formatSelectors = $formatSelectorsQuery.data;
     }
   }
@@ -66,13 +74,15 @@
   }
   function submit() {
     if (!options) return;
+
     $clusterQuery.mutate([
       options.namespace,
       options.datasetName,
       {
-        input: options.input,
+        input: selectedFormatSelector == null ? options.input : null,
         use_garden: options.use_garden,
         output_path: outputColumn,
+        input_selector: selectedFormatSelector,
         overwrite: options.overwrite
       }
     ]);
@@ -87,16 +97,21 @@
       <div class="flex max-w-2xl flex-col gap-y-8">
         <div>
           <FieldSelect
+            disabled={selectedFormatSelector != null && selectedFormatSelector != 'none'}
             filter={f => f.dtype?.type === 'string'}
             defaultPath={options.input}
             bind:path={options.input}
             labelText="Field"
           />
         </div>
-        {#if formatSelectors != null}
+        {#if formatSelectors != null && formatSelectors.length > 0}
           <div>
-            <div class="label text-s mb-2 font-medium text-gray-700">Selector</div>
+            <div class="label text-s mb-2 font-medium text-gray-700">
+              {$datasetManifest?.data?.dataset_manifest.dataset_format?.['format_name']} selector
+            </div>
             <Select hideLabel={true} bind:selected={selectedFormatSelector} required>
+              <SelectItem value={'none'} text={'None'} />
+
               {#each formatSelectors as formatSelector}
                 <SelectItem value={formatSelector} text={formatSelector} />
               {/each}
@@ -105,7 +120,9 @@
         {/if}
         <div>
           <div class="label text-s mb-2 font-medium text-gray-700">
-            {outputColumnRequired ? '*' : ''} Output column
+            {outputColumnRequired ? '*' : ''} Output column {!outputColumnRequired
+              ? '(Optional)'
+              : ''}
           </div>
           <input
             required={outputColumnRequired}
diff --git a/web/blueprint/src/lib/components/commands/selectors/FieldSelect.svelte b/web/blueprint/src/lib/components/commands/selectors/FieldSelect.svelte
index 045d5cde2..a7ad26e64 100644
--- a/web/blueprint/src/lib/components/commands/selectors/FieldSelect.svelte
+++ b/web/blueprint/src/lib/components/commands/selectors/FieldSelect.svelte
@@ -17,6 +17,7 @@
 
   export let defaultPath: Path | undefined = undefined;
   export let path: Path | undefined = undefined;
+  export let disabled = false;
 
   const datasetViewStore = getDatasetViewContext();
 
@@ -83,7 +84,7 @@
     <div class="label text-s mb-2 font-medium text-gray-700">
       {labelText}
     </div>
-    <Select hideLabel={true} {helperText} bind:selected={selectedPath} required>
+    <Select hideLabel={true} {helperText} bind:selected={selectedPath} required {disabled}>
       {#if sourceFields?.length}
         <SelectItemGroup label="Source Fields">
           {#each sourceFields as field}
diff --git a/web/lib/fastapi_client/index.ts b/web/lib/fastapi_client/index.ts
index 29485f716..b58bbe552 100644
--- a/web/lib/fastapi_client/index.ts
+++ b/web/lib/fastapi_client/index.ts
@@ -12,7 +12,6 @@ export type { AuthenticationInfo } from './models/AuthenticationInfo';
 export type { BinaryFilter } from './models/BinaryFilter';
 export type { ClusterInfo } from './models/ClusterInfo';
 export type { ClusterInputFormatSelectorInfo } from './models/ClusterInputFormatSelectorInfo';
-export type { ClusterInputSelectorConfig } from './models/ClusterInputSelectorConfig';
 export type { ClusterOptions } from './models/ClusterOptions';
 export type { ClusterResponse } from './models/ClusterResponse';
 export type { Column } from './models/Column';
diff --git a/web/lib/fastapi_client/models/ClusterInputSelectorConfig.ts b/web/lib/fastapi_client/models/ClusterInputSelectorConfig.ts
deleted file mode 100644
index 29dc41f35..000000000
--- a/web/lib/fastapi_client/models/ClusterInputSelectorConfig.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* generated using openapi-typescript-codegen -- do no edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-
-/**
- * Configures a format selector for a cluster input.
- */
-export type ClusterInputSelectorConfig = {
-    format: string;
-    selector: string;
-};
-
diff --git a/web/lib/fastapi_client/models/ClusterOptions.ts b/web/lib/fastapi_client/models/ClusterOptions.ts
index dab52a970..a5b200fec 100644
--- a/web/lib/fastapi_client/models/ClusterOptions.ts
+++ b/web/lib/fastapi_client/models/ClusterOptions.ts
@@ -3,14 +3,12 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { ClusterInputSelectorConfig } from './ClusterInputSelectorConfig';
-
 /**
  * The request for the cluster endpoint.
  */
 export type ClusterOptions = {
     input?: (Array<string> | string | null);
-    input_selector?: (ClusterInputSelectorConfig | null);
+    input_selector?: (string | null);
     output_path?: (Array<string> | string | null);
     /**
      * Accelerate computation by running remotely on Lilac Garden.