diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/empty.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/empty.svelte
index ebedbecc3..274521e58 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/empty.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/empty.svelte
@@ -89,7 +89,9 @@
             return reorderItems(columnsWithWidths, $columnsOrder);
         }
 
-        return columnsWithWidths;
+        return columnsWithWidths.filter(
+            (column) => !['$id', '$createdAt', '$updatedAt', 'actions'].includes(column.id)
+        );
     });
 
     let resizeObserver: ResizeObserver;
@@ -305,13 +307,7 @@
         // start overlay **after** the last userColumn
         if (staticUserColumns.length > 0) {
             const lastUserColumn = staticUserColumns[staticUserColumns.length - 1];
-            let lastUserCell = getById(lastUserColumn.id);
-
-            if (!lastUserCell) {
-                lastUserCell = headerElement!.querySelector<HTMLElement>(
-                    `[role="cell"][data-column-id="${lastUserColumn.id}"]`
-                );
-            }
+            const lastUserCell = getById(lastUserColumn.id);
 
             if (lastUserCell) {
                 const lastUserRect = lastUserCell.getBoundingClientRect();
@@ -1279,7 +1275,7 @@
                 out:fade={{ duration: 200 }}>
             </div>
 
-            {@render customTooltip({ text: 'Click to select column', show: isHovered })}
+            <!--{@render customTooltip({ text: 'Click to select column', show: isHovered })}-->
         {/if}
     </div>
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/store.ts
index d3673bec9..834bfc7aa 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/store.ts
@@ -60,7 +60,7 @@ export const mockSuggestions: { total: number; columns: ColumnInput[] } = {
     total: 7,
     columns: [
         {
-            name: 'name',
+            name: 'title',
             type: 'string',
             size: 255,
             format: null,
@@ -68,7 +68,7 @@ export const mockSuggestions: { total: number; columns: ColumnInput[] } = {
             formatOptions: null
         },
         {
-            name: 'age',
+            name: 'authorName',
             type: 'string',
             size: 128,
             format: null,