diff --git a/packages/client/src/api/datasources.js b/packages/client/src/api/datasources.js
index 91cdde696a..346bf37843 100644
--- a/packages/client/src/api/datasources.js
+++ b/packages/client/src/api/datasources.js
@@ -7,10 +7,7 @@ import { enrichRows } from "./rows"
 
 export const searchTable = async ({ tableId, search, pagination }) => {
   const rows = await searchTableData({ tableId, search, pagination })
-  return rows
-  // TODO
-  // Enrich rows so they can displayed properly
-  // return await enrichRows(rows, tableId)
+  return await enrichRows(rows, tableId)
 }
 
 /**
diff --git a/packages/standard-components/src/Search.svelte b/packages/standard-components/src/Search.svelte
index 2a71504c9d..fc31645fc3 100644
--- a/packages/standard-components/src/Search.svelte
+++ b/packages/standard-components/src/Search.svelte
@@ -28,7 +28,6 @@
   let page = 0
 
   $: fetchData(table, page)
-  $: searchable = [...(table.indexes || []), ...columns]
   // omit empty strings
   $: parsedSearch = Object.keys(search).reduce(
     (acc, next) =>
@@ -114,14 +113,12 @@
     <p>{noRowsMessage}</p>
   {/if}
   <div class="pagination">
-    <!-- <Button primary on:click={previousPage}>First</Button> -->
     {#if page > 0}
       <Button primary on:click={previousPage}>Back</Button>
     {/if}
     {#if rows.length === pageSize}
       <Button primary on:click={nextPage}>Next</Button>
     {/if}
-    <!-- <Button primary on:click={previousPage}>Last</Button> -->
   </div>
 </div>