diff --git a/src-tauri/src/dynamo/scan_table.rs b/src-tauri/src/dynamo/scan_table.rs
index aac06f0..5542d35 100644
--- a/src-tauri/src/dynamo/scan_table.rs
+++ b/src-tauri/src/dynamo/scan_table.rs
@@ -1,4 +1,5 @@
 use crate::dynamo::types::ApiResponse;
+use aws_sdk_dynamodb::error::ProvideErrorMetadata;
 use aws_sdk_dynamodb::types::AttributeValue;
 use aws_sdk_dynamodb::Client;
 use serde_json::{json, Value};
@@ -185,10 +186,18 @@ pub async fn scan_table(client: &Client, input: ScanTableInput<'_>) -> Result<Ap
                 })),
             })
         }
-        Err(e) => Ok(ApiResponse {
-            status: 500,
-            message: format!("Failed to execute scan: {:?}", e),
-            data: None,
-        }),
+        Err(e) => {
+            let error_code = e.code().unwrap_or("UnknownError").to_string();
+            let error_message = e.message().unwrap_or("UnknownError").to_string();
+
+            Ok(ApiResponse {
+                status: 500,
+                message: format!(
+                    "Failed to execute scan!\n\nerrorCode: {}\nmessage: {}",
+                    error_code, error_message
+                ),
+                data: None,
+            })
+        }
     }
 }
diff --git a/src/datasources/dynamoApi.ts b/src/datasources/dynamoApi.ts
index 8cfc5a1..9bfb316 100644
--- a/src/datasources/dynamoApi.ts
+++ b/src/datasources/dynamoApi.ts
@@ -65,10 +65,10 @@ export type DynamoDBTableInfo = {
 
 export type QueryParams = {
   tableName: string;
-  indexName: string;
+  indexName: string | null;
   partitionKey: {
     name: string;
-    value: string;
+    value: string | null;
   };
   sortKey?: {
     name: string;
diff --git a/src/views/editor/dynamo-editor/components/create-item.vue b/src/views/editor/dynamo-editor/components/create-item.vue
index 38b7696..85bd2e7 100644
--- a/src/views/editor/dynamo-editor/components/create-item.vue
+++ b/src/views/editor/dynamo-editor/components/create-item.vue
@@ -391,7 +391,6 @@ fetchIndices(activeConnection.value as Connection).then(() => {
       type: attributeType,
     }))
     .filter(({ key }) => ![partitionKey.name, sortKey?.name].filter(Boolean).includes(key));
-  console.log('keyAttributes', dynamoRecordForm.value.keyAttributes);
 });
 </script>
 
diff --git a/src/views/editor/dynamo-editor/components/ui-editor.vue b/src/views/editor/dynamo-editor/components/ui-editor.vue
index 7214635..b3d8b2b 100644
--- a/src/views/editor/dynamo-editor/components/ui-editor.vue
+++ b/src/views/editor/dynamo-editor/components/ui-editor.vue
@@ -1,154 +1,177 @@
 <template>
-  <n-card>
-    <n-form
-      ref="dynamoQueryFormRef"
-      :model="dynamoQueryForm"
-      :rules="dynamoQueryFormRules"
-      label-placement="left"
-      require-mark-placement="right-hanging"
-      label-width="auto"
-    >
-      <!-- First row with partition and sort key -->
-      <n-grid :cols="24" :x-gap="12">
-        <n-grid-item span="12">
-          <n-form-item :label="$t('editor.dynamo.tableOrIndex')" path="index">
-            <n-select
-              :placeholder="$t('editor.dynamo.selectTableOrIndex')"
-              v-model:value="dynamoQueryForm.index"
-              remote
-              :loading="loadingRef.index"
-              @update:show="handleIndexOpen"
-              @update:value="handleUpdate"
-              :options="indicesOrTableOptions"
-            />
-          </n-form-item>
-        </n-grid-item>
-
-        <n-grid-item span="12">
-          <n-form-item
-            v-if="selectedIndexOrTable?.partitionKeyName"
-            :label="getLabel('PARTITION_KEY')"
-            path="partitionKey"
-          >
-            <n-input
-              v-model:value="dynamoQueryForm.partitionKey"
-              :placeholder="$t('editor.dynamo.enterPartitionKey')"
-              :input-props="inputProps"
-            />
-          </n-form-item>
-        </n-grid-item>
-
-        <n-grid-item span="12">
-          <n-form-item
-            v-if="selectedIndexOrTable?.sortKeyName"
-            :label="getLabel('SORT_KEY')"
-            path="sortKey"
-          >
-            <n-input
-              v-model:value="dynamoQueryForm.sortKey"
-              :placeholder="$t('editor.dynamo.enterSortKey')"
-              :input-props="inputProps"
-            />
-          </n-form-item>
-        </n-grid-item>
-      </n-grid>
-
-      <!-- Dynamic additional form items -->
-      <n-card :title="$t('editor.dynamo.filterTitle')">
-        <template #header-extra>
-          <n-icon size="26" @click="addFilterItem" style="cursor: pointer">
-            <Add />
-          </n-icon>
-        </template>
-        <n-grid
-          v-for="(item, index) in dynamoQueryForm.formFilterItems"
-          :key="index"
-          :cols="24"
-          :x-gap="12"
+  <n-split direction="vertical" class="ui-editor">
+    <template #1>
+      <n-card class="query-container">
+        <n-form
+          ref="dynamoQueryFormRef"
+          :model="dynamoQueryForm"
+          :rules="dynamoQueryFormRules"
+          label-placement="left"
+          require-mark-placement="right-hanging"
+          label-width="auto"
+          style="width: 100%; height: 100%"
         >
-          <n-grid-item span="9">
-            <n-form-item
-              :path="`formFilterItems[${index}].key`"
-              :rule="{
-                required: true,
-                message: `${lang.t('editor.dynamo.attributeNameRequired')}`,
-                trigger: ['input', 'blur'],
-              }"
-            >
-              <n-input
-                v-model:value="item.key"
-                :placeholder="$t('editor.dynamo.inputAttrName')"
-                :input-props="inputProps"
-              />
-            </n-form-item>
-          </n-grid-item>
-          <n-grid-item span="4">
-            <n-form-item
-              :path="`formFilterItems[${index}].operator`"
-              :rule="{
-                required: true,
-                message: `${lang.t('editor.dynamo.operatorRequired')}`,
-                trigger: ['input', 'blur'],
-              }"
-            >
-              <n-select
-                v-model:value="item.operator"
-                :placeholder="$t('editor.dynamo.inputOperator')"
-                :options="filterConditions"
-              />
-            </n-form-item>
-          </n-grid-item>
-          <n-grid-item span="9">
-            <n-form-item
-              :path="`formFilterItems[${index}].value`"
-              :rule="{
-                required: true,
-                message: `${lang.t('editor.dynamo.attributeValueRequired')}`,
-                trigger: ['input', 'blur'],
-              }"
+          <!-- First row with partition and sort key -->
+          <n-grid :cols="24" :x-gap="12">
+            <n-grid-item span="8">
+              <n-form-item :label="$t('editor.dynamo.tableOrIndex')" path="index">
+                <n-select
+                  :placeholder="$t('editor.dynamo.selectTableOrIndex')"
+                  v-model:value="dynamoQueryForm.index"
+                  remote
+                  :loading="loadingRef.index"
+                  @update:show="handleIndexOpen"
+                  @update:value="handleUpdate"
+                  :options="indicesOrTableOptions"
+                />
+              </n-form-item>
+            </n-grid-item>
+
+            <n-grid-item span="8">
+              <n-form-item
+                v-if="selectedIndexOrTable?.partitionKeyName"
+                :label="getLabel('PARTITION_KEY')"
+                path="partitionKey"
+              >
+                <n-input
+                  v-model:value="dynamoQueryForm.partitionKey"
+                  :placeholder="$t('editor.dynamo.enterPartitionKey')"
+                  :input-props="inputProps"
+                />
+              </n-form-item>
+            </n-grid-item>
+
+            <n-grid-item span="8">
+              <n-form-item
+                v-if="selectedIndexOrTable?.sortKeyName"
+                :label="getLabel('SORT_KEY')"
+                path="sortKey"
+              >
+                <n-input
+                  v-model:value="dynamoQueryForm.sortKey"
+                  :placeholder="$t('editor.dynamo.enterSortKey')"
+                  :input-props="inputProps"
+                />
+              </n-form-item>
+            </n-grid-item>
+          </n-grid>
+
+          <!-- Dynamic additional form items -->
+          <n-card :title="$t('editor.dynamo.filterTitle')" class="additional-filter-container">
+            <template #header-extra>
+              <n-icon size="26" @click="addFilterItem" style="cursor: pointer">
+                <Add />
+              </n-icon>
+            </template>
+            <div class="infinity-scroll-outer-container">
+              <div class="infinity-scroll-inner-container">
+                <n-infinite-scroll style="height: 100%">
+                  <n-grid
+                    v-for="(item, index) in dynamoQueryForm.formFilterItems"
+                    :key="index"
+                    :cols="24"
+                    :x-gap="12"
+                  >
+                    <n-grid-item span="9">
+                      <n-form-item
+                        :path="`formFilterItems[${index}].key`"
+                        :rule="{
+                          required: true,
+                          message: `${lang.t('editor.dynamo.attributeNameRequired')}`,
+                          trigger: ['input', 'blur'],
+                        }"
+                      >
+                        <n-input
+                          v-model:value="item.key"
+                          :placeholder="$t('editor.dynamo.inputAttrName')"
+                          :input-props="inputProps"
+                        />
+                      </n-form-item>
+                    </n-grid-item>
+                    <n-grid-item span="4">
+                      <n-form-item
+                        :path="`formFilterItems[${index}].operator`"
+                        :rule="{
+                          required: true,
+                          message: `${lang.t('editor.dynamo.operatorRequired')}`,
+                          trigger: ['input', 'blur'],
+                        }"
+                      >
+                        <n-select
+                          v-model:value="item.operator"
+                          :placeholder="$t('editor.dynamo.inputOperator')"
+                          :options="filterConditions"
+                        />
+                      </n-form-item>
+                    </n-grid-item>
+                    <n-grid-item span="9">
+                      <n-form-item
+                        :path="`formFilterItems[${index}].value`"
+                        :rule="{
+                          required: true,
+                          message: `${lang.t('editor.dynamo.attributeValueRequired')}`,
+                          trigger: ['input', 'blur'],
+                        }"
+                      >
+                        <n-input
+                          v-model:value="item.value"
+                          :placeholder="$t('editor.dynamo.inputAttrValue')"
+                          :input-props="inputProps"
+                        />
+                      </n-form-item>
+                    </n-grid-item>
+                    <n-grid-item span="2">
+                      <n-button quaternary circle @click="removeFilterItem(index)">
+                        <template #icon>
+                          <n-icon>
+                            <Delete />
+                          </n-icon>
+                        </template>
+                      </n-button>
+                    </n-grid-item>
+                  </n-grid>
+                </n-infinite-scroll>
+              </div>
+            </div>
+          </n-card>
+        </n-form>
+        <template #footer>
+          <div class="card-footer">
+            <n-button type="warning" tertiary @click="handleReset">
+              {{ $t('dialogOps.reset') }}
+            </n-button>
+            <n-button
+              type="primary"
+              @click="handleSubmit"
+              :disabled="!validationPassed"
+              :loading="loadingRef.queryResult"
             >
-              <n-input
-                v-model:value="item.value"
-                :placeholder="$t('editor.dynamo.inputAttrValue')"
-                :input-props="inputProps"
-              />
-            </n-form-item>
-          </n-grid-item>
-          <n-grid-item span="2">
-            <n-button quaternary circle @click="removeFilterItem(index)">
-              <template #icon>
-                <n-icon>
-                  <Delete />
-                </n-icon>
-              </template>
+              {{ $t('dialogOps.execute') }}
             </n-button>
-          </n-grid-item>
-        </n-grid>
+          </div>
+        </template>
       </n-card>
-    </n-form>
-    <template #footer>
-      <div class="card-footer">
-        <n-button type="warning" tertiary @click="handleReset">
-          {{ $t('dialogOps.reset') }}
-        </n-button>
-        <n-button
-          type="primary"
-          @click="handleSubmit"
-          :disabled="!validationPassed"
-          :loading="loadingRef.queryResult"
-        >
-          {{ $t('dialogOps.execute') }}
-        </n-button>
-      </div>
     </template>
-  </n-card>
-  <n-card :title="$t('editor.dynamo.resultTitle')" v-if="queryResult.data">
-    <n-data-table
-      :columns="queryResult.columns"
-      :data="queryResult.data"
-      :loading="loadingRef.queryResult"
-    />
-  </n-card>
+    <template #2>
+      <n-card
+        :title="$t('editor.dynamo.resultTitle')"
+        v-if="queryResult.data"
+        class="query-result-container"
+      >
+        <div class="infinity-scroll-outer-container">
+          <div class="infinity-scroll-inner-container">
+            <n-infinite-scroll style="height: 100%">
+              <n-data-table
+                :columns="queryResult.columns"
+                :data="queryResult.data"
+                :loading="loadingRef.queryResult"
+              />
+            </n-infinite-scroll>
+          </div>
+        </div>
+      </n-card>
+    </template>
+  </n-split>
 </template>
 
 <script setup lang="ts">
@@ -196,11 +219,11 @@ const message = useMessage();
 const lang = useLang();
 
 const dynamoQueryForm = ref<{
-  index: string;
-  partitionKey: string;
-  sortKey: string;
+  index: string | null;
+  partitionKey: string | null;
+  sortKey: string | null;
   formFilterItems: Array<{ key: string; value: string; operator: string }>;
-}>({ index: '', partitionKey: '', sortKey: '', formFilterItems: [] });
+}>({ index: null, partitionKey: null, sortKey: null, formFilterItems: [] });
 
 const dynamoQueryFormRules = reactive<FormRules>({
   index: [
@@ -240,10 +263,11 @@ const indicesOrTableOptions = ref<Array<DynamoIndexOrTableOption>>([]);
 
 const selectedIndexOrTable = ref<DynamoIndexOrTableOption | undefined>(undefined);
 
-const handleUpdate = (value: string) => {
+const handleUpdate = (value: string, options: DynamoIndexOrTableOption) => {
   const indices = getDynamoIndexOrTableOption.value(activeConnection.value as DynamoDBConnection);
-  selectedIndexOrTable.value = indices.find(item => item.value === value);
-  dynamoQueryForm.value.index = selectedIndexOrTable.value!.value;
+  selectedIndexOrTable.value = indices.find(({ label }) => label === options.label);
+
+  dynamoQueryForm.value.index = value;
 };
 
 const getLabel = (label: string) => {
@@ -268,9 +292,9 @@ const handleIndexOpen = async (isOpen: boolean) => {
   loadingRef.value.index = true;
   try {
     await fetchIndices(activeConnection.value as Connection);
-    indicesOrTableOptions.value = getDynamoIndexOrTableOption.value(
-      activeConnection.value as DynamoDBConnection,
-    );
+    indicesOrTableOptions.value = getDynamoIndexOrTableOption
+      .value(activeConnection.value as DynamoDBConnection)
+      .map(item => ({ ...item, value: item.label }));
   } catch (err) {
     message.error(`status: ${(err as Error).name}, details: ${(err as Error).message}`, {
       closable: true,
@@ -307,16 +331,21 @@ const handleSubmit = async (event: MouseEvent) => {
     return;
   }
 
-  loadingRef.value.queryResult = true;
   try {
+    loadingRef.value.queryResult = true;
+    queryResult.value = { columns: [], data: undefined };
+
     const { tableName } = activeConnection.value as DynamoDBConnection;
     const { partitionKey, sortKey, formFilterItems } = dynamoQueryForm.value;
-    const { partitionKeyName, sortKeyName, value } =
-      selectedIndexOrTable.value as DynamoIndexOrTableOption;
+    const indices = getDynamoIndexOrTableOption.value(activeConnection.value as DynamoDBConnection);
+    const { partitionKeyName, sortKeyName, label, value } = indices.find(
+      item => item.label === dynamoQueryForm.value.index,
+    ) as DynamoIndexOrTableOption;
+
     // Build query parameters
     const queryParams = {
       tableName,
-      indexName: value,
+      indexName: label.startsWith('Table - ') ? null : (value ?? null),
       partitionKey: { name: partitionKeyName, value: partitionKey },
       sortKey: sortKeyName && sortKey ? { name: sortKeyName, value: sortKey } : undefined,
       filters: formFilterItems,
@@ -342,7 +371,6 @@ const handleSubmit = async (event: MouseEvent) => {
       data: columnsData,
     };
   } catch (error) {
-    queryResult.value = { columns: [], data: undefined };
     const { status, details } = error as CustomError;
     message.error(`status: ${status}, details: ${details}`, {
       closable: true,
@@ -356,7 +384,7 @@ const handleSubmit = async (event: MouseEvent) => {
 
 const handleReset = () => {
   selectedIndexOrTable.value = undefined;
-  dynamoQueryForm.value = { index: '', partitionKey: '', sortKey: '', formFilterItems: [] };
+  dynamoQueryForm.value = { index: null, partitionKey: null, sortKey: null, formFilterItems: [] };
 
   if (dynamoQueryFormRef.value) {
     dynamoQueryFormRef.value.restoreValidation();
@@ -365,9 +393,41 @@ const handleReset = () => {
 </script>
 
 <style lang="scss" scoped>
-.card-footer {
+.ui-editor {
+  width: 100%;
+  height: 100%;
+
+  .query-container {
+    width: 100%;
+    height: 100%;
+
+    .additional-filter-container {
+      width: 100%;
+      height: calc(100% - 60px);
+    }
+
+    .card-footer {
+      display: flex;
+      justify-content: flex-end;
+      gap: 12px;
+    }
+  }
+
+  .query-result-container {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+.infinity-scroll-outer-container {
+  width: 100%;
+  height: 100%;
   display: flex;
-  justify-content: flex-end;
-  gap: 12px;
+  flex-direction: column;
+
+  .infinity-scroll-inner-container {
+    flex: 1;
+    height: 0;
+  }
 }
 </style>