diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index ff4c65e1cf..87daad4c3a 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -17,7 +17,7 @@
       return
     }
     queries.select(query)
-    $goto(`./datasource/${query.datasourceId}/query/${query._id}`)
+    $goto(`./datasource/${query.datasourceId}/${query._id}`)
   }
 
   onMount(() => {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/query/[query]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/query/[query]/_layout.svelte
rename to packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/query/[query]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/query/[query]/index.svelte
rename to packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/entity/[entity]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/entity/[entity]/_layout.svelte
deleted file mode 100644
index 4d6acc22ae..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/entity/[entity]/_layout.svelte
+++ /dev/null
@@ -1,13 +0,0 @@
-<script>
-  import { params } from "@roxi/routify"
-  import { queries } from "stores/backend"
-
-  if ($params.query) {
-    const query = $queries.list.find(m => m._id === $params.query)
-    if (query) {
-      queries.select(query)
-    }
-  }
-</script>
-
-<slot />
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/entity/[entity]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/entity/[entity]/index.svelte
deleted file mode 100644
index 495fa1c844..0000000000
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/entity/[entity]/index.svelte
+++ /dev/null
@@ -1,62 +0,0 @@
-<script>
-  import { params } from "@roxi/routify"
-  import { notifications } from "@budibase/bbui"
-  import { database, queries } from "stores/backend"
-  import api from "builderStore/api"
-  import Table from "components/backend/DataTable/Table.svelte"
-
-  let loading = false
-  let data = []
-  let schema = {}
-
-  async function fetchData() {
-    try {
-      const query = {
-            endpoint: {
-              datasourceId: $params.selectedDatasource,
-              operation: "READ",
-              // table name below
-              entityId: $params.entity,
-            },
-            resource: {
-              // fields: ["name", "age"],
-            },
-            filters: {
-              // string: {
-              //   name: "John",
-              // },
-            },
-      }
-      const response = await api.post(`/api/datasources/query`, query)
-      const json = await response.json()
-      console.log(json)
-    } catch (err) {
-      notifications.error("Error fetching data")
-      console.error(err)
-    }
-  }
-
-  // $: selectedQuery = $queries.list.find(
-  //   query => query._id === $queries.selected
-  // ) || {
-  //   datasourceId: $params.selectedDatasource,
-  //   parameters: [],
-  //   fields: {},
-  //   queryVerb: "read",
-  // }
-
-  fetchData()
-</script>
-
-<section>
-  <Table 
-    {title}
-    {schema}
-    {data}
-    allowEditing={true}
-    {loading}
-  />
-</section>
-
-<style>
-</style>