diff --git a/README.md b/README.md
index f0fe339a02..2cc352607b 100644
--- a/README.md
+++ b/README.md
@@ -103,13 +103,9 @@ The Budibase builder runs in Electron, on Mac, PC and Linux. Follow the steps be
 
 ## 🤖 Self-hosting
 
-<p align="center">
-  <img src="https://i.imgur.com/Z52cEvT.png?1" />
-</p>
-
 Budibase wants to make sure anyone can use the tools we develop and we know a lot of people need to be able to host the apps they make on their own systems - that is why we've decided to try and make self hosting as easy as possible!
 
-Currently, you can host your apps using Docker. The documentation for self-hosting can be found [here](https://docs.budibase.com/self-hosting/introduction-to-self-hosting).
+Currently, you can host your apps using Docker or Digital Ocean. The documentation for self-hosting can be found [here](https://docs.budibase.com/self-hosting/introduction-to-self-hosting).
 
 
 ## 🎓 Learning Budibase
diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index 004c7170d3..022e78c637 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -46,7 +46,7 @@ export const getDatasourceForProvider = component => {
 
   // Extract datasource from component instance
   const datasourceSetting = def.settings.find(setting => {
-    return setting.key === def.datasourceSetting
+    return setting.type === "datasource" || setting.type === "table"
   })
   if (!datasourceSetting) {
     return null
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewFieldSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewFieldSelect.svelte
index 0e93c3e73a..32935d8d0a 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewFieldSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewFieldSelect.svelte
@@ -12,7 +12,7 @@
   export let multiselect = false
 
   $: datasource = getDatasourceForProvider(componentInstance)
-  $: schema = getSchemaForDatasource(datasource)
+  $: schema = getSchemaForDatasource(datasource).schema
   $: options = Object.keys(schema || {})
 </script>
 
diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index c9c13c4dba..e66f467a00 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -106,7 +106,6 @@
     "styleable": true,
     "hasChildren": true,
     "dataProvider": true,
-    "datasourceSetting": "datasource",
     "settings": [
       {
         "type": "datasource",
@@ -439,7 +438,6 @@
     "styleable": true,
     "hasChildren": true,
     "dataProvider": true,
-    "datasourceSetting": "table",
     "settings": [
       {
         "type": "table",
@@ -455,7 +453,6 @@
     "hasChildren": true,
     "styleable": true,
     "dataProvider": true,
-    "datasourceSetting": "table",
     "settings": [
       {
         "type": "table",