diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
index 793f3cc186..2db5490678 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
@@ -3,13 +3,14 @@
   import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
 
   export let integration
+  export let schema
 
   let unsaved = false
 </script>
 
 <form>
-  {#each Object.keys(integration) as configKey}
-    {#if typeof integration[configKey] === 'object'}
+  {#each Object.keys(schema) as configKey}
+    {#if typeof schema[configKey].type === 'object'}
       <Label small>{configKey}</Label>
       <Spacer small />
       <KeyValueBuilder bind:object={integration[configKey]} on:change />
@@ -18,7 +19,7 @@
         <Label small>{configKey}</Label>
         <Input
           outline
-          type={integration[configKey].type}
+          type={schema[configKey].type}
           on:change
           bind:value={integration[configKey]} />
       </div>
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index 596b4a3a1a..c80a0020ea 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -92,7 +92,7 @@
 
       if (response.status !== 200) throw new Error(json.message)
 
-      data = json || []
+      data = json.rows || []
 
       if (data.length === 0) {
         notifier.info(
@@ -103,9 +103,9 @@
 
       notifier.success("Query executed successfully.")
 
-      // Assume all the fields are strings and create a basic schema
-      // from the first record returned by the query
-      fields = Object.keys(json[0]).map(field => ({
+      // Assume all the fields are strings and create a basic schema from the
+      // unique fields returned by the server
+      fields = json.schemaFields.map(field => ({
         name: field,
         type: "STRING",
       }))
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 6415f3f9de..4fb13131eb 100644
--- a/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -13,6 +13,11 @@
   )
   $: integration = datasource && $backendUiStore.integrations[datasource.source]
 
+  $: console.log({
+    datasource,
+    integration,
+  })
+
   async function saveDatasource() {
     // Create datasource
     await backendUiStore.actions.datasources.save(datasource)
@@ -74,6 +79,7 @@
 
       <Spacer extraLarge />
       <IntegrationConfigForm
+        schema={integration.datasource}
         integration={datasource.config}
         on:change={setUnsaved} />
       <Spacer extraLarge />
diff --git a/packages/server/src/api/controllers/query.js b/packages/server/src/api/controllers/query.js
index 04ff019a38..55c2ad14b0 100644
--- a/packages/server/src/api/controllers/query.js
+++ b/packages/server/src/api/controllers/query.js
@@ -115,9 +115,17 @@ exports.preview = async function(ctx) {
 
   const enrichedQuery = await enrichQueryFields(fields, parameters)
 
-  ctx.body = formatResponse(
+  const rows = formatResponse(
     await new Integration(datasource.config)[queryVerb](enrichedQuery)
   )
+
+  // get all the potential fields in the schema
+  const keys = rows.flatMap(Object.keys)
+
+  ctx.body = {
+    rows,
+    schemaFields: [...new Set(keys)],
+  }
 }
 
 exports.execute = async function(ctx) {
diff --git a/packages/server/src/integrations/airtable.js b/packages/server/src/integrations/airtable.js
index 004deff16e..2c83712289 100644
--- a/packages/server/src/integrations/airtable.js
+++ b/packages/server/src/integrations/airtable.js
@@ -8,7 +8,7 @@ const SCHEMA = {
   friendlyName: "Airtable",
   datasource: {
     apiKey: {
-      type: FIELD_TYPES.STRING,
+      type: FIELD_TYPES.PASSWORD,
       default: "enter api key",
       required: true,
     },