diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
index 8b66cef86..e2e7ea3e4 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
@@ -1,15 +1,15 @@
 <script>
-  // import { params } from "@sveltech/routify"
-  // import { backendUiStore } from "builderStore"
+  import { params } from "@sveltech/routify"
+  import { backendUiStore } from "builderStore"
 
-  // if ($params.selectedDatasource) {
-  //   const datasource = $backendUiStore.datasources.find(
-  //     m => m._id === $params.selectedDatasource
-  //   )
-  //   if (datasource) {
-  //     backendUiStore.actions.datasources.select(datasource._id)
-  //   }
-  // }
+  if ($params.query) {
+    const query = $backendUiStore.queries.find(
+      m => m._id === $params.query
+    )
+    if (query) {
+      backendUiStore.actions.queries.select(query)
+    }
+  }
 </script>
 
 <slot />
diff --git a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
index f859e8d39..46ae11bd0 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto, beforeUrlChange } from "@sveltech/routify"
-  import { Button, Heading, Body, Spacer, Icon } from "@budibase/bbui"
+  import { Button, Heading, Body, Spacer } from "@budibase/bbui"
   import { backendUiStore } from "builderStore"
   import { notifier } from "builderStore/store/notifications"
   import IntegrationConfigForm from "components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte"