diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte
index c653bcabf8..19c5f274d2 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/CreateEditRelationship/CreateEditRelationship.svelte
@@ -1,20 +1,21 @@
 <script>
   import { RelationshipTypes } from "constants/backend"
   import { Menu, MenuItem, MenuSection, Button, Input, Icon, ModalContent, RadioGroup, Heading } from "@budibase/bbui"
+  import { tables } from "stores/backend"
 
   export let save
   export let datasource
   export let from
-  export let tables
+  export let plusTables
   export let relationship = {}
 
   let originalName = relationship.name
 
   $: console.log(relationship)
   $: valid = relationship.name && relationship.tableId && relationship.relationshipType
-  $: from = tables.find(table => table._id === relationship.source)
-  $: to = tables.find(table => table._id === relationship.tableId)
-  $: through = tables.find(table => table._id === relationship.through)
+  $: from = plusTables.find(table => table._id === relationship.source)
+  $: to = plusTables.find(table => table._id === relationship.tableId)
+  $: through = plusTables.find(table => table._id === relationship.through)
   $: linkTable = through || to
 
   $: relationshipOptions = from && to ?  [
@@ -43,11 +44,11 @@
       ...relationship
     }
     if (originalName) {
-      // TODO: possible bug if you change name
-      delete datasource.entities[from.name][originalName]
+      delete datasource.entities[from.name].schema[originalName]
     }
 
     save()
+    tables.fetch()
   }
 </script>
 
@@ -63,7 +64,7 @@
   <div class="table-selector">
     <Menu>
       <MenuSection heading="From">
-        {#each tables as table}
+        {#each plusTables as table}
           <MenuItem noClose icon="Table" on:click={() => (relationship.source = table._id)}>
             {table.name}
              {#if relationship.source === table._id}
@@ -75,7 +76,7 @@
     </Menu>
     <Menu>
       <MenuSection heading="To">
-        {#each tables as table}
+        {#each plusTables as table}
           <MenuItem noClose icon="Table" on:click={() => (relationship.tableId = table._id)}>
             {table.name}
              {#if relationship.tableId === table._id}
@@ -102,7 +103,7 @@
   {#if relationship?.relationshipType === RelationshipTypes.MANY_TO_MANY}
     <Menu>
       <MenuSection heading="Join Table">
-        {#each tables as table}
+        {#each plusTables as table}
           <MenuItem noClose icon="Table" on:click={() => (relationship.through = table._id)}>
             {table.name}
               {#if relationship.through === table._id}
@@ -119,9 +120,9 @@
       <Menu>
         <MenuSection heading={`${linkTable.name} Column`}>
           {#each Object.keys(linkTable.schema) as column}
-            <MenuItem noClose icon="Table" on:click={() => (relationship.foreignKey = column)}>
+            <MenuItem noClose icon="Table" on:click={() => (relationship.fieldName = column)}>
               {column}
-                {#if relationship.foreignKey === column}
+                {#if relationship.fieldName === column}
                   <Icon size="S" name="Checkmark" />
                 {/if}
             </MenuItem>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
index be26411742..1b693c80d7 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
@@ -10,10 +10,11 @@
 
   let unsaved = false
   let relationshipModal
+  let selectedRelationship
 
   $: datasource = $datasources.list.find(ds => ds._id === $datasources.selected)
   $: integration = datasource && $integrations[datasource.source]
-  $: plusTables = datasource?.plus ? Object.values(datasource.entities) : []
+  $: plusTables = datasource?.plus ? Object.values(datasource.entities || {}) : []
 
   function buildRelationshipDisplayString(fromTable, toTable) {
     let displayString = fromTable.name
@@ -64,7 +65,8 @@
     unsaved = true
   }
 
-  function openRelationshipModal() {
+  function openRelationshipModal(relationship) {
+    selectedRelationship = relationship
     relationshipModal.show()
   }
 
@@ -80,7 +82,7 @@
 </script>
 
 <Modal bind:this={relationshipModal}>
-  <CreateEditRelationship {datasource} save={saveDatasource} tables={plusTables} />
+  <CreateEditRelationship {datasource} save={saveDatasource} {plusTables} relationship={selectedRelationship} />
 </Modal>
 
 {#if datasource && integration}
@@ -152,11 +154,9 @@
                   {#if table.schema[column].type === "link"}
                     <div
                       class="query-list-item"
-                      on:click={() => onClickTable(table.schema[column])}
-                    >
+                      on:click={() => openRelationshipModal(table.schema[column])}>
                       <p class="query-name">{table.schema[column].name}</p>
                       <p>{buildRelationshipDisplayString(table, table.schema[column])}</p>
-                      <!-- <p>{table.name} → {getTableNameFromId(table.schema[column].tableId)} ({table.schema[column].relationshipType}) </p> -->
                       <p>→</p>
                     </div>
                   {/if}
diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte
index 08e4a2ec8b..e881fa37d2 100644
--- a/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/users/_components/UpdateRolesModal.svelte
@@ -9,7 +9,7 @@
   const dispatch = createEventDispatcher()
 
   const roles = app.roles
-  let options = roles.map(role => role._id)
+  let options = roles.map(role => ({ value: role._id, label: role.name }))
   let selectedRole = user?.roles?.[app?._id]
 
   async function updateUserRoles() {