diff --git a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
index e86d503a59..28c4edece5 100644
--- a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
+++ b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte
@@ -28,7 +28,7 @@
         {/each}
       </select>
     {:else}
-      <Input onChange={onChange} value={parameter.value} />
+      <Input {onChange} value={parameter.value} />
       <button on:click={() => (isOpen = !isOpen)}>
         <div class="icon" style={`transform: rotate(${isOpen ? 0 : 90}deg);`}>
           <ArrowDownIcon size={36} />
diff --git a/packages/builder/src/components/userInterface/ModelSelect.svelte b/packages/builder/src/components/userInterface/ModelSelect.svelte
index ae5014e31f..44fa2e51e0 100644
--- a/packages/builder/src/components/userInterface/ModelSelect.svelte
+++ b/packages/builder/src/components/userInterface/ModelSelect.svelte
@@ -7,7 +7,7 @@
 <div class="uk-margin block-field">
   <div class="uk-form-controls">
     <select class="budibase__input" on:change {value}>
-      <option value=""></option>
+      <option value="" />
       {#each $backendUiStore.models as model}
         <option value={model._id}>{model.name}</option>
       {/each}
diff --git a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
index 2cce5f7863..cab1b68ecf 100644
--- a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
+++ b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
@@ -7,7 +7,7 @@
 <div class="uk-margin block-field">
   <div class="uk-form-controls">
     <select class="budibase__input" bind:value>
-      <option value=""></option>
+      <option value="" />
       {#each $backendUiStore.models as model}
         <option value={model}>{model.name}</option>
       {/each}
diff --git a/packages/server/src/api/controllers/model.js b/packages/server/src/api/controllers/model.js
index a30026a645..9d06c7a413 100644
--- a/packages/server/src/api/controllers/model.js
+++ b/packages/server/src/api/controllers/model.js
@@ -10,6 +10,12 @@ exports.fetch = async function(ctx) {
   ctx.body = body.rows.map(row => row.doc)
 }
 
+exports.find = async function(ctx) {
+  const db = new CouchDB(ctx.params.instanceId)
+  const model = await db.get(ctx.params.id)
+  ctx.body = model
+}
+
 exports.create = async function(ctx) {
   const db = new CouchDB(ctx.params.instanceId)
   const newModel = {
diff --git a/packages/server/src/api/controllers/static.js b/packages/server/src/api/controllers/static.js
index 32542de546..557a9efe7a 100644
--- a/packages/server/src/api/controllers/static.js
+++ b/packages/server/src/api/controllers/static.js
@@ -13,7 +13,6 @@ exports.serveBuilder = async function(ctx) {
 }
 
 exports.serveApp = async function(ctx) {
-  // TODO: update homedir stuff to wherever budi is run
   // default to homedir
   const appPath = resolve(
     budibaseAppsDir(),
@@ -26,7 +25,6 @@ exports.serveApp = async function(ctx) {
 }
 
 exports.serveComponentLibrary = async function(ctx) {
-  // TODO: update homedir stuff to wherever budi is run
   // default to homedir
   let componentLibraryPath = resolve(
     budibaseAppsDir(),
diff --git a/packages/server/src/api/routes/model.js b/packages/server/src/api/routes/model.js
index 831aefd7f6..388f4618bd 100644
--- a/packages/server/src/api/routes/model.js
+++ b/packages/server/src/api/routes/model.js
@@ -43,6 +43,7 @@ router
 
 router
   .get("/api/:instanceId/models", authorized(BUILDER), modelController.fetch)
+  .get("/api/:instanceId/models/:id", authorized(BUILDER), modelController.find)
   .post("/api/:instanceId/models", authorized(BUILDER), modelController.create)
   // .patch("/api/:instanceId/models", controller.update)
   .delete(
diff --git a/packages/standard-components/src/DataForm.svelte b/packages/standard-components/src/DataForm.svelte
index 6213dd231a..3a47ddbd2d 100644
--- a/packages/standard-components/src/DataForm.svelte
+++ b/packages/standard-components/src/DataForm.svelte
@@ -8,19 +8,32 @@
   let username
   let password
   let newModel = {
-    modelId: model._id,
+    modelId: model,
   }
   let store = _bb.store
+  let schema = {}
+  let modelDef = {}
 
-  $: fields = Object.keys(model.schema)
+  $: if (model && model.length !== 0) {
+    fetchModel()
+  }
+
+  $: fields = Object.keys(schema)
+
+  async function fetchModel() {
+    const FETCH_MODEL_URL = `/api/${_instanceId}/models/${model}`
+    const response = await _bb.api.get(FETCH_MODEL_URL)
+    modelDef = await response.json()
+    schema = modelDef.schema
+  }
 
   async function save() {
-    const SAVE_RECORD_URL = `/api/${_instanceId}/records`
+    const SAVE_RECORD_URL = `/api/${_instanceId}/${model}/records`
     const response = await _bb.api.post(SAVE_RECORD_URL, newModel)
     const json = await response.json()
 
     store.update(state => {
-      state[model._id] = [...state[model._id], json]
+      state[model._id] = [...state[model], json]
       return state
     })
   }
@@ -46,14 +59,14 @@
 </script>
 
 <form class="uk-form" on:submit|preventDefault>
-  <h4>{model.name}</h4>
+  <h4>{modelDef.name}</h4>
   <div>
     {#each fields as field}
       <div class="uk-margin">
         <label class="form-label" for="form-stacked-text">{field}</label>
         <input
           class="uk-input"
-          type={model.schema[field].type === 'string' ? 'text' : model.schema[field].type}
+          type={schema[field].type === 'string' ? 'text' : schema[field].type}
           on:change={handleInput(field)} />
       </div>
     {/each}