diff --git a/common/constants/data_sources.ts b/common/constants/data_sources.ts
index e02243d56..ad36822b4 100644
--- a/common/constants/data_sources.ts
+++ b/common/constants/data_sources.ts
@@ -39,7 +39,8 @@ export const ACCELERATION_INDEX_NAME_REGEX = /^[a-z0-9_]+$/;
 export const ACCELERATION_S3_URL_REGEX = /^(s3|s3a):\/\/[a-zA-Z0-9.\-]+/;
 export const SPARK_HIVE_TABLE_REGEX = /Provider:\s*hive/;
 export const SANITIZE_QUERY_REGEX = /\s+/g;
-export const TIMESTAMP_DATATYPE = 'timestamp';
+export const SPARK_TIMESTAMP_DATATYPE = 'timestamp';
+export const SPARK_STRING_DATATYPE = 'string';
 
 export const ACCELERATION_INDEX_TYPES = [
   { label: 'Skipping Index', value: 'skipping' },
@@ -49,6 +50,8 @@ export const ACCELERATION_INDEX_TYPES = [
 
 export const ACC_INDEX_TYPE_DOCUMENTATION_URL =
   'https://github.com/opensearch-project/opensearch-spark/blob/main/docs/index.md';
+export const ACC_CHECKPOINT_DOCUMENTATION_URL =
+  'https://github.com/opensearch-project/opensearch-spark/blob/main/docs/index.md#create-index-options';
 
 export const ACCELERATION_INDEX_NAME_INFO = `All OpenSearch acceleration indices have a naming format of pattern: \`prefix_<index name>_suffix\`. They share a common prefix structure, which is \`flint_<data source name>_<database name>_<table name>_\`. Additionally, they may have a suffix that varies based on the index type. 
 ##### Skipping Index
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/__tests__/__snapshots__/create_acceleration.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/__tests__/__snapshots__/create_acceleration.test.tsx.snap
index 5e0c5a775..d5b4b8e5c 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/__tests__/__snapshots__/create_acceleration.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/__tests__/__snapshots__/create_acceleration.test.tsx.snap
@@ -655,6 +655,39 @@ Array [
                         >
                           Checkpoint location
                         </label>
+                         
+                        <div
+                          class="euiText euiText--extraSmall"
+                        >
+                          <a
+                            class="euiLink euiLink--primary"
+                            href="https://github.com/opensearch-project/opensearch-spark/blob/main/docs/index.md#create-index-options"
+                            rel="noopener noreferrer"
+                            target="_blank"
+                          >
+                            Learn more
+                            <svg
+                              aria-hidden="true"
+                              aria-label="External link"
+                              class="euiIcon euiIcon--small euiIcon-isLoading euiLink__externalIcon"
+                              focusable="false"
+                              height="16"
+                              role="img"
+                              viewBox="0 0 16 16"
+                              width="16"
+                              xmlns="http://www.w3.org/2000/svg"
+                            >
+                              <path
+                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                              />
+                            </svg>
+                            <span
+                              class="euiScreenReaderOnly"
+                            >
+                              (opens in a new tab or window)
+                            </span>
+                          </a>
+                        </div>
                       </div>
                       <div
                         class="euiFormRow__fieldWrapper"
@@ -814,7 +847,7 @@ Array [
                                   <span
                                     class="euiTableCellContent__text"
                                   >
-                                    Please add fields
+                                    You have no definitions defined.
                                   </span>
                                 </div>
                               </td>
@@ -2081,6 +2114,40 @@ Array [
                           >
                             Checkpoint location
                           </label>
+                           
+                          <div
+                            className="euiText euiText--extraSmall"
+                          >
+                            <a
+                              className="euiLink euiLink--primary"
+                              href="https://github.com/opensearch-project/opensearch-spark/blob/main/docs/index.md#create-index-options"
+                              rel="noopener noreferrer"
+                              target="_blank"
+                            >
+                              Learn more
+                              <svg
+                                aria-hidden={true}
+                                aria-label="External link"
+                                className="euiIcon euiIcon--small euiIcon-isLoading euiLink__externalIcon"
+                                focusable="false"
+                                height={16}
+                                role="img"
+                                style={null}
+                                viewBox="0 0 16 16"
+                                width={16}
+                                xmlns="http://www.w3.org/2000/svg"
+                              >
+                                <path
+                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                />
+                              </svg>
+                              <span
+                                className="euiScreenReaderOnly"
+                              >
+                                (opens in a new tab or window)
+                              </span>
+                            </a>
+                          </div>
                         </div>
                         <div
                           className="euiFormRow__fieldWrapper"
@@ -2271,7 +2338,7 @@ Array [
                                       <span
                                         className="euiTableCellContent__text"
                                       >
-                                        Please add fields
+                                        You have no definitions defined.
                                       </span>
                                     </div>
                                   </td>
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/create_acceleration.tsx b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/create_acceleration.tsx
index c6f3ddbb4..da0dc8707 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/create_acceleration.tsx
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/create_acceleration.tsx
@@ -28,6 +28,7 @@ import { DirectQueryLoadingStatus } from '../../../../../../../../common/types/e
 import { useLoadTableColumnsToCache } from '../../../../../../../framework/catalog_cache/cache_loader';
 import { CatalogCacheManager } from '../../../../../../../framework/catalog_cache/cache_manager';
 import { coreRefs } from '../../../../../../../framework/core_refs';
+import { useToast } from '../../../../../../common/toast';
 import { IndexAdvancedSettings } from '../selectors/index_advanced_settings';
 import { IndexSettingOptions } from '../selectors/index_setting_options';
 import { IndexTypeSelector } from '../selectors/index_type_selector';
@@ -43,6 +44,7 @@ export interface CreateAccelerationProps {
   resetFlyout: () => void;
   databaseName?: string;
   tableName?: string;
+  refreshHandler?: () => void;
 }
 
 export const CreateAcceleration = ({
@@ -51,6 +53,7 @@ export const CreateAcceleration = ({
   databaseName,
   tableName,
 }: CreateAccelerationProps) => {
+  const { setToast } = useToast();
   const http = coreRefs!.http;
   const [accelerationFormData, setAccelerationFormData] = useState<CreateAccelerationForm>({
     dataSource: selectedDatasource,
@@ -135,13 +138,17 @@ export const CreateAcceleration = ({
     stopLoadingTableFields();
     if (dataTable !== '') {
       setTableFieldsLoading(true);
-      const cachedTable = CatalogCacheManager.getTable(dataSource, database, dataTable);
-
-      if (cachedTable.columns) {
-        loadColumnsToAccelerationForm(cachedTable);
-        setTableFieldsLoading(false);
-      } else {
-        startLoading(dataSource, database, dataTable);
+      try {
+        const cachedTable = CatalogCacheManager.getTable(dataSource, database, dataTable);
+        if (cachedTable.columns) {
+          loadColumnsToAccelerationForm(cachedTable);
+          setTableFieldsLoading(false);
+        } else {
+          startLoading(dataSource, database, dataTable);
+        }
+      } catch (error) {
+        setToast('Your cache is outdated, refresh databases and tables', 'warning');
+        console.error(error);
       }
     }
   };
@@ -159,11 +166,18 @@ export const CreateAcceleration = ({
   useEffect(() => {
     const status = loadStatus.toLowerCase();
     if (status === DirectQueryLoadingStatus.SUCCESS) {
-      const cachedTable = CatalogCacheManager.getTable(
-        accelerationFormData.dataSource,
-        accelerationFormData.database,
-        accelerationFormData.dataTable
-      );
+      let cachedTable = {} as CachedTable;
+      try {
+        cachedTable = CatalogCacheManager.getTable(
+          accelerationFormData.dataSource,
+          accelerationFormData.database,
+          accelerationFormData.dataTable
+        );
+      } catch (error) {
+        setToast('Your cache is outdated, refresh databases and tables', 'warning');
+        console.error(error);
+      }
+
       loadColumnsToAccelerationForm(cachedTable);
       setTableFieldsLoading(false);
     } else if (
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/create_acceleration_button.tsx b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/create_acceleration_button.tsx
index b1429515c..8a8724827 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/create_acceleration_button.tsx
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/create/create_acceleration_button.tsx
@@ -59,13 +59,14 @@ export const CreateAccelerationButton = ({
       status === DirectQueryLoadingStatus.CANCELED
     ) {
       setIsLoading(false);
-      setToast('Create acceleration query failed', 'success');
     }
   }, [directqueryLoadStatus]);
 
-  return (
+  const createAccelerationBtn = (
     <EuiButton onClick={createAcceleration} fill isLoading={isLoading}>
-      Create acceleration
+      {isLoading ? 'Creating acceleration' : 'Create acceleration'}
     </EuiButton>
   );
+
+  return createAccelerationBtn;
 };
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_setting_options.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_setting_options.test.tsx.snap
index e38d3bce5..d4b97ea70 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_setting_options.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/__tests__/__snapshots__/index_setting_options.test.tsx.snap
@@ -124,6 +124,40 @@ Array [
       >
         Checkpoint location
       </label>
+       
+      <div
+        className="euiText euiText--extraSmall"
+      >
+        <a
+          className="euiLink euiLink--primary"
+          href="https://github.com/opensearch-project/opensearch-spark/blob/main/docs/index.md#create-index-options"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Learn more
+          <svg
+            aria-hidden={true}
+            aria-label="External link"
+            className="euiIcon euiIcon--small euiIcon-isLoading euiLink__externalIcon"
+            focusable="false"
+            height={16}
+            role="img"
+            style={null}
+            viewBox="0 0 16 16"
+            width={16}
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+            />
+          </svg>
+          <span
+            className="euiScreenReaderOnly"
+          >
+            (opens in a new tab or window)
+          </span>
+        </a>
+      </div>
     </div>
     <div
       className="euiFormRow__fieldWrapper"
@@ -284,6 +318,39 @@ Array [
       >
         Checkpoint location
       </label>
+       
+      <div
+        className="euiText euiText--extraSmall"
+      >
+        <a
+          className="euiLink euiLink--primary"
+          href="https://github.com/opensearch-project/opensearch-spark/blob/main/docs/index.md#create-index-options"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Learn more
+          <svg
+            aria-label="External link"
+            className="euiIcon euiIcon--small euiLink__externalIcon"
+            focusable="false"
+            height={16}
+            role="img"
+            style={null}
+            viewBox="0 0 16 16"
+            width={16}
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M13 8.5a.5.5 0 1 1 1 0V12a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h3.5a.5.5 0 0 1 0 1H4a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V8.5Zm-5.12.339a.5.5 0 1 1-.706-.707L13.305 2H10.5a.5.5 0 1 1 0-1H14a1 1 0 0 1 1 1v3.5a.5.5 0 1 1-1 0V2.72L7.88 8.838Z"
+            />
+          </svg>
+          <span
+            className="euiScreenReaderOnly"
+          >
+            (opens in a new tab or window)
+          </span>
+        </a>
+      </div>
     </div>
     <div
       className="euiFormRow__fieldWrapper"
@@ -444,6 +511,39 @@ Array [
       >
         Checkpoint location
       </label>
+       
+      <div
+        className="euiText euiText--extraSmall"
+      >
+        <a
+          className="euiLink euiLink--primary"
+          href="https://github.com/opensearch-project/opensearch-spark/blob/main/docs/index.md#create-index-options"
+          rel="noopener noreferrer"
+          target="_blank"
+        >
+          Learn more
+          <svg
+            aria-label="External link"
+            className="euiIcon euiIcon--small euiLink__externalIcon"
+            focusable="false"
+            height={16}
+            role="img"
+            style={null}
+            viewBox="0 0 16 16"
+            width={16}
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M13 8.5a.5.5 0 1 1 1 0V12a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h3.5a.5.5 0 0 1 0 1H4a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V8.5Zm-5.12.339a.5.5 0 1 1-.706-.707L13.305 2H10.5a.5.5 0 1 1 0-1H14a1 1 0 0 1 1 1v3.5a.5.5 0 1 1-1 0V2.72L7.88 8.838Z"
+            />
+          </svg>
+          <span
+            className="euiScreenReaderOnly"
+          >
+            (opens in a new tab or window)
+          </span>
+        </a>
+      </div>
     </div>
     <div
       className="euiFormRow__fieldWrapper"
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/index_setting_options.tsx b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/index_setting_options.tsx
index 36164e331..7da778d9f 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/index_setting_options.tsx
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/index_setting_options.tsx
@@ -7,6 +7,7 @@ import {
   EuiFieldNumber,
   EuiFieldText,
   EuiFormRow,
+  EuiLink,
   EuiSelect,
   EuiSpacer,
   EuiSuperSelect,
@@ -14,7 +15,10 @@ import {
 } from '@elastic/eui';
 import producer from 'immer';
 import React, { ChangeEvent, Fragment, useState } from 'react';
-import { ACCELERATION_TIME_INTERVAL } from '../../../../../../../../common/constants/data_sources';
+import {
+  ACC_CHECKPOINT_DOCUMENTATION_URL,
+  ACCELERATION_TIME_INTERVAL,
+} from '../../../../../../../../common/constants/data_sources';
 import {
   AccelerationRefreshType,
   CreateAccelerationForm,
@@ -221,6 +225,13 @@ export const IndexSettingOptions = ({
           helpText="The HDFS compatible file system location path for incremental refresh job checkpoint."
           isInvalid={hasError(accelerationFormData.formErrors, 'checkpointLocationError')}
           error={accelerationFormData.formErrors.checkpointLocationError}
+          labelAppend={
+            <EuiText size="xs">
+              <EuiLink href={ACC_CHECKPOINT_DOCUMENTATION_URL} target="_blank">
+                Learn more
+              </EuiLink>
+            </EuiText>
+          }
         >
           <EuiFieldText
             placeholder="s3://checkpoint/location"
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/preview_sql_defintion.tsx b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/preview_sql_defintion.tsx
index 9ce5c8e42..a22b87b28 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/preview_sql_defintion.tsx
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/preview_sql_defintion.tsx
@@ -104,7 +104,7 @@ export const PreviewSQLDefinition = ({
 
   const queryWorkbenchButton = sqlWorkbenchPLuginExists ? (
     <EuiButton iconSide="right" onClick={openInWorkbench}>
-      Continue in Query Workbench
+      Edit in Query Workbench
     </EuiButton>
   ) : (
     <></>
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/source_selector.tsx b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/source_selector.tsx
index f1dac3eac..d086b0c28 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/source_selector.tsx
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/selectors/source_selector.tsx
@@ -20,12 +20,13 @@ import React, { useEffect, useState } from 'react';
 import { CoreStart } from '../../../../../../../../../../src/core/public';
 import { DATACONNECTIONS_BASE } from '../../../../../../../../common/constants/shared';
 import {
+  CachedDatabase,
   CachedDataSourceStatus,
   CreateAccelerationForm,
 } from '../../../../../../../../common/types/data_connections';
 import { CatalogCacheManager } from '../../../../../../../framework/catalog_cache/cache_manager';
 import { useToast } from '../../../../../../common/toast';
-import { hasError, validateDataTable, validateDatabase } from '../create/utils';
+import { hasError, validateDatabase, validateDataTable } from '../create/utils';
 import { SelectorLoadDatabases } from './selector_helpers/load_databases';
 import { SelectorLoadObjects } from './selector_helpers/load_objects';
 
@@ -111,18 +112,25 @@ export const AccelerationDataSourceSelector = ({
 
   const loadTables = () => {
     if (selectedDatabase.length > 0) {
-      const dbCache = CatalogCacheManager.getDatabase(
-        accelerationFormData.dataSource,
-        accelerationFormData.database
-      );
-      if (dbCache.status === CachedDataSourceStatus.Updated && dbCache.tables.length > 0) {
-        const tableLabels = dbCache.tables.map((tb) => ({ label: tb.name }));
-        setTables(tableLabels);
-      } else if (
-        (dbCache.status === CachedDataSourceStatus.Updated && dbCache.tables.length === 0) ||
-        dbCache.status === CachedDataSourceStatus.Empty
-      ) {
+      let dbCache = {} as CachedDatabase;
+      try {
+        dbCache = CatalogCacheManager.getDatabase(
+          accelerationFormData.dataSource,
+          accelerationFormData.database
+        );
+        if (dbCache.status === CachedDataSourceStatus.Updated && dbCache.tables.length > 0) {
+          const tableLabels = dbCache.tables.map((tb) => ({ label: tb.name }));
+          setTables(tableLabels);
+        } else if (
+          (dbCache.status === CachedDataSourceStatus.Updated && dbCache.tables.length === 0) ||
+          dbCache.status === CachedDataSourceStatus.Empty
+        ) {
+          setTables([]);
+        }
+      } catch (error) {
         setTables([]);
+        setToast('Your cache is outdated, refresh databases and tables', 'warning');
+        console.error(error);
       }
       setSelectedTable([]);
       setAccelerationFormData({ ...accelerationFormData, dataTable: '' });
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/__tests__/__snapshots__/query_visual_editor.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/__tests__/__snapshots__/query_visual_editor.test.tsx.snap
index 85e73b484..628a20254 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/__tests__/__snapshots__/query_visual_editor.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/__tests__/__snapshots__/query_visual_editor.test.tsx.snap
@@ -241,7 +241,7 @@ Array [
                   <span
                     className="euiTableCellContent__text"
                   >
-                    Please add fields
+                    You have no definitions defined.
                   </span>
                 </div>
               </td>
@@ -728,12 +728,6 @@ Array [
                         </option>
                         <option
                           key="2"
-                          value="MIN_MAX"
-                        >
-                          Min Max
-                        </option>
-                        <option
-                          key="3"
                           value="BLOOM_FILTER"
                         >
                           Bloom Filter
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/materialized_view/group_by_tumble_expression.tsx b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/materialized_view/group_by_tumble_expression.tsx
index 76df0ce2f..226030e0e 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/materialized_view/group_by_tumble_expression.tsx
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/materialized_view/group_by_tumble_expression.tsx
@@ -18,7 +18,7 @@ import producer from 'immer';
 import React, { useState } from 'react';
 import {
   ACCELERATION_TIME_INTERVAL,
-  TIMESTAMP_DATATYPE,
+  SPARK_TIMESTAMP_DATATYPE,
 } from '../../../../../../../../../common/constants/data_sources';
 import {
   CreateAccelerationForm,
@@ -99,7 +99,7 @@ export const GroupByTumbleExpression = ({
                 placeholder="Select one or more options"
                 singleSelection={{ asPlainText: true }}
                 options={accelerationFormData.dataTableFields
-                  .filter((value) => value.dataType.includes(TIMESTAMP_DATATYPE))
+                  .filter((value) => value.dataType.includes(SPARK_TIMESTAMP_DATATYPE))
                   .map((value) => ({ label: value.fieldName }))}
                 selectedOptions={[{ label: groupbyValues.timeField }]}
                 onChange={onChangeTimeField}
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/skipping_index_builder.test.tsx.snap b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/skipping_index_builder.test.tsx.snap
index d9b73eabb..669a7fe70 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/skipping_index_builder.test.tsx.snap
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/__tests__/__snapshots__/skipping_index_builder.test.tsx.snap
@@ -151,7 +151,7 @@ Array [
                 <span
                   className="euiTableCellContent__text"
                 >
-                  Please add fields
+                  You have no definitions defined.
                 </span>
               </div>
             </td>
@@ -482,12 +482,6 @@ Array [
                       </option>
                       <option
                         key="2"
-                        value="MIN_MAX"
-                      >
-                        Min Max
-                      </option>
-                      <option
-                        key="3"
                         value="BLOOM_FILTER"
                       >
                         Bloom Filter
diff --git a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/skipping_index_builder.tsx b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/skipping_index_builder.tsx
index 1669d05c8..3fb9bc72b 100644
--- a/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/skipping_index_builder.tsx
+++ b/public/components/datasources/components/manage/accelerations/create_accelerations_flyout/visual_editors/skipping_index/skipping_index_builder.tsx
@@ -14,7 +14,10 @@ import {
   EuiText,
 } from '@elastic/eui';
 import React, { useEffect, useState } from 'react';
-import { SKIPPING_INDEX_ACCELERATION_METHODS } from '../../../../../../../../../common/constants/data_sources';
+import {
+  SKIPPING_INDEX_ACCELERATION_METHODS,
+  SPARK_STRING_DATATYPE,
+} from '../../../../../../../../../common/constants/data_sources';
 import {
   CreateAccelerationForm,
   SkippingIndexAccMethodType,
@@ -100,7 +103,11 @@ export const SkippingIndexBuilder = ({
       render: (item: SkippingIndexRowType) => (
         <EuiSelect
           id="selectDocExample"
-          options={SKIPPING_INDEX_ACCELERATION_METHODS}
+          options={
+            item.dataType === SPARK_STRING_DATATYPE
+              ? SKIPPING_INDEX_ACCELERATION_METHODS.filter((method) => method.value !== 'MIN_MAX')
+              : SKIPPING_INDEX_ACCELERATION_METHODS
+          }
           value={item.accelerationMethod}
           onChange={(e) => onChangeAccelerationMethod(e, item)}
           aria-label="Use aria labels when no actual label is in use"
@@ -162,7 +169,7 @@ export const SkippingIndexBuilder = ({
         noItemsMessage={
           isSkippingtableLoading
             ? 'Auto-generating skipping index definition.'
-            : 'Please add fields'
+            : 'You have no definitions defined.'
         }
       />
       <EuiFlexGroup justifyContent="spaceBetween">
diff --git a/public/framework/catalog_cache/cache_loader.tsx b/public/framework/catalog_cache/cache_loader.tsx
index 63129a4c3..481e777b8 100644
--- a/public/framework/catalog_cache/cache_loader.tsx
+++ b/public/framework/catalog_cache/cache_loader.tsx
@@ -68,32 +68,36 @@ export const updateTablesToCache = (
   databaseName: string,
   pollingResult: AsyncPollingResult
 ) => {
-  const cachedDatabase = CatalogCacheManager.getDatabase(dataSourceName, databaseName);
-  const currentTime = new Date().toUTCString();
+  try {
+    const cachedDatabase = CatalogCacheManager.getDatabase(dataSourceName, databaseName);
+    const currentTime = new Date().toUTCString();
+
+    if (!pollingResult) {
+      CatalogCacheManager.updateDatabase(dataSourceName, {
+        ...cachedDatabase,
+        tables: [],
+        lastUpdated: currentTime,
+        status: CachedDataSourceStatus.Failed,
+      });
+      return;
+    }
+
+    const combinedData = combineSchemaAndDatarows(pollingResult.schema, pollingResult.datarows);
+    const newTables = combinedData
+      .filter((row: any) => !SPARK_HIVE_TABLE_REGEX.test(row.information))
+      .map((row: any) => ({
+        name: row.tableName,
+      }));
 
-  if (!pollingResult) {
     CatalogCacheManager.updateDatabase(dataSourceName, {
       ...cachedDatabase,
-      tables: [],
+      tables: newTables,
       lastUpdated: currentTime,
-      status: CachedDataSourceStatus.Failed,
+      status: CachedDataSourceStatus.Updated,
     });
-    return;
+  } catch (error) {
+    console.error(error);
   }
-
-  const combinedData = combineSchemaAndDatarows(pollingResult.schema, pollingResult.datarows);
-  const newTables = combinedData
-    .filter((row: any) => !SPARK_HIVE_TABLE_REGEX.test(row.information))
-    .map((row: any) => ({
-      name: row.tableName,
-    }));
-
-  CatalogCacheManager.updateDatabase(dataSourceName, {
-    ...cachedDatabase,
-    tables: newTables,
-    lastUpdated: currentTime,
-    status: CachedDataSourceStatus.Updated,
-  });
 };
 
 export const updateAccelerationsToCache = (
@@ -138,38 +142,44 @@ export const updateTableColumnsToCache = (
   tableName: string,
   pollingResult: AsyncPollingResult
 ) => {
-  if (!pollingResult) {
-    return;
-  }
-  const cachedDatabase = CatalogCacheManager.getDatabase(dataSourceName, databaseName);
-  const currentTime = new Date().toUTCString();
+  try {
+    if (!pollingResult) {
+      return;
+    }
+    const cachedDatabase = CatalogCacheManager.getDatabase(dataSourceName, databaseName);
+    const currentTime = new Date().toUTCString();
 
-  const combinedData: Array<{ col_name: string; data_type: string }> = combineSchemaAndDatarows(
-    pollingResult.schema,
-    pollingResult.datarows
-  );
+    const combinedData: Array<{ col_name: string; data_type: string }> = combineSchemaAndDatarows(
+      pollingResult.schema,
+      pollingResult.datarows
+    );
 
-  const tableColumns: CachedColumn[] = [];
-  for (const row of combinedData) {
-    if (row.col_name === SPARK_PARTITION_INFO) {
-      break;
+    const tableColumns: CachedColumn[] = [];
+    for (const row of combinedData) {
+      if (row.col_name === SPARK_PARTITION_INFO) {
+        break;
+      }
+      tableColumns.push({
+        fieldName: row.col_name,
+        dataType: row.data_type,
+      });
     }
-    tableColumns.push({
-      fieldName: row.col_name,
-      dataType: row.data_type,
-    });
-  }
 
-  const newTables: CachedTable[] = cachedDatabase.tables.map((ts) =>
-    ts.name === tableName ? { ...ts, columns: tableColumns } : { ...ts }
-  );
+    const newTables: CachedTable[] = cachedDatabase.tables.map((ts) =>
+      ts.name === tableName ? { ...ts, columns: tableColumns } : { ...ts }
+    );
 
-  CatalogCacheManager.updateDatabase(dataSourceName, {
-    ...cachedDatabase,
-    tables: newTables,
-    lastUpdated: currentTime,
-    status: CachedDataSourceStatus.Updated,
-  });
+    if (cachedDatabase.status === CachedDataSourceStatus.Updated) {
+      CatalogCacheManager.updateDatabase(dataSourceName, {
+        ...cachedDatabase,
+        tables: newTables,
+        lastUpdated: currentTime,
+        status: CachedDataSourceStatus.Updated,
+      });
+    }
+  } catch (error) {
+    console.error(error);
+  }
 };
 
 export const updateToCache = (
diff --git a/public/framework/datasources/direct_query_hook.tsx b/public/framework/datasources/direct_query_hook.tsx
index f4776385e..a896a5395 100644
--- a/public/framework/datasources/direct_query_hook.tsx
+++ b/public/framework/datasources/direct_query_hook.tsx
@@ -74,6 +74,7 @@ export const useDirectQuery = () => {
       setLoadStatus(status);
       stopLoading();
     } else if (status === DirectQueryLoadingStatus.FAILED) {
+      setLoadStatus(status);
       stopLoading();
       const formattedError = formatError(
         '',