diff --git a/docker-compose.yaml b/docker-compose.yaml
index b19f3aa26..f15413a71 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,8 +3,8 @@
 version: "3"
 services:
   dbgate:
-    build: docker
-    # image: dbgate/dbgate:beta-alpine
+    # build: docker
+    image: dbgate/dbgate:beta-alpine
     restart: always
     ports:
       - 3100:3000
@@ -14,8 +14,8 @@ services:
     volumes:
       - dbgate-data:/root/dbgate-data
     
-    # environment:
-    #   WEB_ROOT: /dbgate
+    environment:
+      WEB_ROOT: /dbgate
 
     # volumes:
     #   - /home/jena/test/chinook:/mnt/sqt
diff --git a/packages/web/src/tableeditor/VirtualForeignKeyEditorModal.svelte b/packages/web/src/tableeditor/VirtualForeignKeyEditorModal.svelte
index 17ac7270a..c1647c39b 100644
--- a/packages/web/src/tableeditor/VirtualForeignKeyEditorModal.svelte
+++ b/packages/web/src/tableeditor/VirtualForeignKeyEditorModal.svelte
@@ -29,7 +29,12 @@
   let refTableName = null;
   let refSchemaName = null;
 
-  $: refTableInfo = $dbInfo?.tables?.find(x => x.pureName == refTableName && x.schemaName == refSchemaName);
+  $: tableList = [
+    ..._.sortBy($dbInfo?.tables || [], ['schemaName', 'pureName']),
+    // ..._.sortBy($dbInfo?.views || [], ['schemaName', 'pureName']),
+  ];
+
+  $: refTableInfo = tableList.find(x => x.pureName == refTableName && x.schemaName == refSchemaName);
   // $dbInfo?.views?.find(x => x.pureName == refTableName && x.schemaName == refSchemaName);
 
   onMount(() => {
@@ -43,6 +48,7 @@
     }
   });
 
+  // $: console.log('conid, database', conid, database);
   // $: console.log('$dbInfo?.tables', $dbInfo?.tables);
 </script>
 
@@ -58,10 +64,7 @@
             value={fullNameToString({ pureName: refTableName, schemaName: refSchemaName })}
             isNative
             notSelected
-            options={[
-              ..._.sortBy($dbInfo?.tables || [], ['schemaName', 'pureName']),
-              // ..._.sortBy($dbInfo?.views || [], ['schemaName', 'pureName']),
-            ].map(tbl => ({
+            options={tableList.map(tbl => ({
               label: fullNameToLabel(tbl),
               value: fullNameToString(tbl),
             }))}