diff --git a/frontend/src/components/grid-items.svelte b/frontend/src/components/grid-items.svelte
index 9f5af73..5effd17 100644
--- a/frontend/src/components/grid-items.svelte
+++ b/frontend/src/components/grid-items.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { resolveKeypath, setValue } from '$lib/keypaths';
-  import contextMenu from '$lib/stores/contextmenu';
   import { createEventDispatcher } from 'svelte';
-  import FormInput from './forminput.svelte';
   import Icon from './icon.svelte';
+  import FormInput from './forminput.svelte';
+  import contextMenu from '$lib/stores/contextmenu';
+  import { resolveKeypath, setValue } from '$lib/keypaths';
 
   export let items = [];
   export let columns = [];
diff --git a/frontend/src/components/grid.svelte b/frontend/src/components/grid.svelte
index a582675..80d7790 100644
--- a/frontend/src/components/grid.svelte
+++ b/frontend/src/components/grid.svelte
@@ -88,7 +88,6 @@
     border-collapse: collapse;
     width: 100%;
     background-color: #fff;
-    table-layout: fixed;
   }
 
   table thead {
diff --git a/frontend/src/organisms/connection/collection/components/querychooser.svelte b/frontend/src/organisms/connection/collection/components/querychooser.svelte
index b036099..bdd22eb 100644
--- a/frontend/src/organisms/connection/collection/components/querychooser.svelte
+++ b/frontend/src/organisms/connection/collection/components/querychooser.svelte
@@ -10,6 +10,7 @@
   export let queryToSave = undefined;
   export let collection = {};
   export let show = false;
+  export let hosts = {};
 
   const dispatch = createEventDispatcher();
   let gridSelectedPath = [];
@@ -84,8 +85,12 @@
 
     <div class="querylist">
       <Grid
-        columns={[ { key: 'name', title: 'Query name' } ]}
-        items={$queries}
+        columns={[ { key: 'n', title: 'Query name' }, { key: 'h', title: 'Host' }, { key: 'ns', title: 'Namespace' } ]}
+        key="n"
+        items={Object.entries($queries).reduce((object, [ name, query ]) => {
+          object[query.name] = { n: name, h: hosts[query.hostKey]?.name || '?', ns: `${query.dbKey}.${query.collKey}` };
+          return object;
+        }, {})}
         showHeaders={true}
         canRemoveItems={true}
         bind:activePath={gridSelectedPath}
@@ -102,8 +107,8 @@
 
       {#if Object.keys($queries).includes(queryToSave.name)}
         <Hint>
-          You are about to <strong>overwrite</strong> a saved query. Rename it
-          if you do not want to overwrite.
+          You are about to <strong>overwrite</strong> a saved query. Give it
+          another name if you do not want to overwrite.
         </Hint>
       {/if}
     {:else}
@@ -120,7 +125,7 @@
   }
 
   textarea {
-    min-height: 100px;
+    min-height: 75px;
   }
 
   .querylist {
diff --git a/frontend/src/organisms/connection/collection/find.svelte b/frontend/src/organisms/connection/collection/find.svelte
index af56ee5..8305efd 100644
--- a/frontend/src/organisms/connection/collection/find.svelte
+++ b/frontend/src/organisms/connection/collection/find.svelte
@@ -14,6 +14,7 @@
   // import ObjectViewer from '$components/objectviewer.svelte';
 
   export let collection;
+  export let hosts = {};
 
   const dispatch = createEventDispatcher();
   const defaults = {
@@ -233,6 +234,8 @@
   bind:queryToSave
   bind:show={showQueryChooser}
   on:select={queryChosen}
+  {hosts}
+  {collection}
 />
 
 <!-- <ObjectViewer bind:data={objectViewerData} /> -->
diff --git a/frontend/src/organisms/connection/collection/index.svelte b/frontend/src/organisms/connection/collection/index.svelte
index 9a4c5b7..b7452cc 100644
--- a/frontend/src/organisms/connection/collection/index.svelte
+++ b/frontend/src/organisms/connection/collection/index.svelte
@@ -15,6 +15,7 @@
   export let hostKey;
   export let dbKey;
   export let collectionKey;
+  export let hosts = {};
 
   let tab = 'find';
   let find;
@@ -55,7 +56,7 @@
 
       <div class="container">
         {#if tab === 'stats'} <Stats {collection} />
-        {:else if tab === 'find'} <Find {collection} bind:this={find} on:openViewConfig={openViewConfig} />
+        {:else if tab === 'find'} <Find {collection} {hosts} bind:this={find} on:openViewConfig={openViewConfig} />
         {:else if tab === 'insert'} <Insert {collection} on:performFind={catchQuery} on:openViewConfig={openViewConfig} />
         {:else if tab === 'update'} <Update {collection} on:performFind={catchQuery} />
         {:else if tab === 'remove'} <Remove {collection} />
diff --git a/frontend/src/organisms/connection/index.svelte b/frontend/src/organisms/connection/index.svelte
index 46965a2..1354877 100644
--- a/frontend/src/organisms/connection/index.svelte
+++ b/frontend/src/organisms/connection/index.svelte
@@ -119,6 +119,7 @@
   hostKey={activeHostKey}
   dbKey={activeDbKey}
   collectionKey={activeCollKey}
+  {hosts}
 />
 
 <HostDetail
diff --git a/main.go b/main.go
index 84dc3ce..5d1c62a 100644
--- a/main.go
+++ b/main.go
@@ -32,21 +32,16 @@ func main() {
 
 		BackgroundColour: &options.RGBA{R: 0, G: 0, B: 139, A: 1},
 		Menu:             app.Menu(),
+		Bind:             []interface{}{app},
+		AssetServer:      &assetserver.Options{Assets: assets},
+
+		OnStartup:  app.Startup,
+		OnShutdown: app.Shutdown,
 
-		OnStartup:          app.Startup,
-		OnShutdown:         app.Shutdown,
 		Logger:             logger.NewFileLogger(path.Join(app.Env.LogDirectory, "rolens.log")),
 		LogLevel:           logger.TRACE,
 		LogLevelProduction: logger.INFO,
 
-		AssetServer: &assetserver.Options{
-			Assets: assets,
-		},
-
-		Bind: []interface{}{
-			app,
-		},
-
 		Mac: &mac.Options{
 			TitleBar:             mac.TitleBarHiddenInset(),
 			WebviewIsTransparent: true,