diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index 4f17ed808..61fd89a2d 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -140,13 +140,11 @@
           <option value={queryVerb}>{queryVerb}</option>
         {/each}
       </Select>
-    {#if query.queryVerb}
       <Select thin secondary bind:value={query.queryType}>
-        {#each Object.keys(config[query.queryVerb]) as queryType}
+        {#each Object.keys(config[query.queryVerb]) as queryType (queryType)}
           <option value={queryType}>{queryType}</option>
         {/each}
       </Select>
-    {/if}
     <EditQueryParamsPopover bind:parameters={query.parameters} bindable={false} />
     <Spacer medium />
     <Button primary href={docsLink} target="_blank">
diff --git a/packages/builder/src/components/integration/index.svelte b/packages/builder/src/components/integration/index.svelte
index 1f0aa30c4..2206694fd 100644
--- a/packages/builder/src/components/integration/index.svelte
+++ b/packages/builder/src/components/integration/index.svelte
@@ -20,11 +20,6 @@
   }
 </script>
 
-{#if editable}
-  <ParameterBuilder bind:parameters={query.parameters} bindable={false} />
-  <Spacer large />
-{/if}
-
 <Heading extraSmall black>Query</Heading>
 <Spacer medium />
 
diff --git a/packages/builder/src/components/userInterface/TableViewSelect.svelte b/packages/builder/src/components/userInterface/TableViewSelect.svelte
index c0ad36a79..3d600af21 100644
--- a/packages/builder/src/components/userInterface/TableViewSelect.svelte
+++ b/packages/builder/src/components/userInterface/TableViewSelect.svelte
@@ -91,7 +91,7 @@
 </div>
 {#if value.type === 'query'}
   <i class="ri-settings-5-line" on:click={drawer.show} />
-    <Drawer title={'Query'}>
+    <Drawer title={'Query'} bind:this={drawer}>
       <div slot="buttons">
         <Button
           blue