diff --git a/packages/builder/src/builderStore/fetchBindableProperties.js b/packages/builder/src/builderStore/fetchBindableProperties.js
index 962fb80ebf..9302f3c0f0 100644
--- a/packages/builder/src/builderStore/fetchBindableProperties.js
+++ b/packages/builder/src/builderStore/fetchBindableProperties.js
@@ -23,13 +23,20 @@ import { cloneDeep, difference } from "lodash/fp"
  * @param {fetchBindablePropertiesParameter} param
  * @returns {Array.<BindableProperty>}
  */
-export default function({ componentInstanceId, screen, components, tables }) {
+export default function({
+  componentInstanceId,
+  screen,
+  components,
+  tables,
+  queries,
+}) {
   const result = walk({
     // cloning so we are free to mutate props (e.g. by adding _contexts)
     instance: cloneDeep(screen.props),
     targetId: componentInstanceId,
     components,
     tables,
+    queries,
   })
 
   return [
@@ -37,6 +44,9 @@ export default function({ componentInstanceId, screen, components, tables }) {
       .filter(isInstanceInSharedContext(result))
       .map(componentInstanceToBindable),
     ...(result.target?._contexts.map(contextToBindables(tables)).flat() ?? []),
+    ...(result.target?._contexts
+      .map(context => queriesToBindables(queries, context))
+      .flat() ?? []),
   ]
 }
 
@@ -61,9 +71,36 @@ const componentInstanceToBindable = i => {
   }
 }
 
+const queriesToBindables = (queries, context) => {
+  let queryId = context.table._id
+
+  const query = queries.find(query => query._id === queryId)
+  let schema = query?.schema
+
+  // Avoid crashing whenever no data source has been selected
+  if (!schema) {
+    return []
+  }
+
+  const queryBindings = Object.entries(schema).map(([key, value]) => ({
+    type: "context",
+    fieldSchema: value,
+    instance: context.instance,
+    // how the binding expression persists, and is used in the app at runtime
+    runtimeBinding: `${context.instance._id}.${key}`,
+    // how the binding expressions looks to the user of the builder
+    readableBinding: `${context.instance._instanceName}.${query.name}.${key}`,
+    // table / view info
+    table: context.table,
+  }))
+
+  return queryBindings
+}
+
 const contextToBindables = tables => context => {
-  const tableId = context.table?.tableId ?? context.table
-  const table = tables.find(table => table._id === tableId)
+  let tableId = context.table?.tableId ?? context.table
+
+  const table = tables.find(table => table._id === tableId || context.table._id)
   let schema =
     context.table?.type === "view"
       ? table?.views?.[context.table.name]?.schema
@@ -152,8 +189,8 @@ const walk = ({ instance, targetId, components, tables, result }) => {
 
   const currentContexts = [...result.currentContexts]
   for (let child of instance._children || []) {
-    // attaching _contexts of components, for eas comparison later
-    // these have been deep cloned above, so shouln't modify the
+    // attaching _contexts of components, for easy comparison later
+    // these have been deep cloned above, so shouldn't modify the
     // original component instances
     child._contexts = currentContexts
     walk({ instance: child, targetId, components, tables, result })
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/CreateRow.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/CreateRow.svelte
index 388b247a4b..fa2186a909 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/CreateRow.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/CreateRow.svelte
@@ -11,6 +11,7 @@
     components: $store.components,
     screen: $currentAsset,
     tables: $backendUiStore.tables,
+    queries: $backendUiStore.queries,
   })
 
   const tableFields = tableId => {
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/DeleteRow.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/DeleteRow.svelte
index b53b6f664a..287f93f835 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/DeleteRow.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/DeleteRow.svelte
@@ -12,6 +12,7 @@
     components: $store.components,
     screen: $currentAsset,
     tables: $backendUiStore.tables,
+    queries: $backendUiStore.queries,
   })
 
   $: idFields = bindableProperties.filter(
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/ExecuteQuery.svelte
index 175eff823b..0f56d1f7ed 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/ExecuteQuery.svelte
@@ -15,6 +15,7 @@
     components: $store.components,
     screen: $currentAsset,
     tables: $backendUiStore.tables,
+    queries: $backendUiStore.queries
   }).map(property => ({
     ...property,
     category: property.type === "instance" ? "Component" : "Table",
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/SaveFields.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/SaveFields.svelte
index 221b41f199..ec1112f520 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/SaveFields.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/SaveFields.svelte
@@ -44,6 +44,7 @@
     components: $store.components,
     screen: $currentAsset,
     tables: $backendUiStore.tables,
+    queries: $backendUiStore.queries,
   })
 
   const addField = () => {
@@ -114,8 +115,7 @@
     <Spacer small />
 
     <TextButton text small blue on:click={addField}>
-      Add
-      {fieldLabel}
+      Add {fieldLabel}
       <div style="height: 20px; width: 20px;">
         <AddIcon />
       </div>
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/SaveRow.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/SaveRow.svelte
index 8fba08b59b..5347dc47f5 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/SaveRow.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/SaveRow.svelte
@@ -20,6 +20,7 @@
     components: $store.components,
     screen: $currentAsset,
     tables: $backendUiStore.tables,
+    queries: $backendUiStore.queries,
   })
 
   $: {
diff --git a/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRow.svelte b/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRow.svelte
index f1c06ff937..4630adfb2a 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRow.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/actions/UpdateRow.svelte
@@ -15,6 +15,7 @@
     components: $store.components,
     screen: $currentAsset,
     tables: $backendUiStore.tables,
+    queries: $backendUiStore.queries,
   })
 
   let idFields
diff --git a/packages/builder/src/components/userInterface/PropertyControl.svelte b/packages/builder/src/components/userInterface/PropertyControl.svelte
index f96e8e6a42..4bf9082091 100644
--- a/packages/builder/src/components/userInterface/PropertyControl.svelte
+++ b/packages/builder/src/components/userInterface/PropertyControl.svelte
@@ -35,6 +35,7 @@
       components: $store.components,
       screen: $currentAsset,
       tables: $backendUiStore.tables,
+      queries: $backendUiStore.queries,
     })
   }
 
diff --git a/packages/builder/src/components/userInterface/ScreenSelect.svelte b/packages/builder/src/components/userInterface/ScreenSelect.svelte
index 9a3e555740..a1f9f76f20 100644
--- a/packages/builder/src/components/userInterface/ScreenSelect.svelte
+++ b/packages/builder/src/components/userInterface/ScreenSelect.svelte
@@ -31,6 +31,7 @@
       components: $store.components,
       screen: $currentAsset,
       tables: $backendUiStore.tables,
+      queries: $backendUiStore.queries,
     })
 
     const detailScreens = $allScreens.filter(screen =>
diff --git a/packages/builder/src/components/userInterface/TableViewSelect.svelte b/packages/builder/src/components/userInterface/TableViewSelect.svelte
index 694a2c0b7a..be16a9109a 100644
--- a/packages/builder/src/components/userInterface/TableViewSelect.svelte
+++ b/packages/builder/src/components/userInterface/TableViewSelect.svelte
@@ -45,6 +45,7 @@
     components: $store.components,
     screen: $currentAsset,
     tables: $backendUiStore.tables,
+    queries: $backendUiStore.queries
   })
 
   $: queryBindableProperties = bindableProperties.map(property => ({