diff --git a/packages/builder/src/components/integration/KeyValueBuilder.svelte b/packages/builder/src/components/integration/KeyValueBuilder.svelte
index 7f4d1fbd56..2a1f3901ea 100644
--- a/packages/builder/src/components/integration/KeyValueBuilder.svelte
+++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte
@@ -47,9 +47,14 @@
   }))
   let fieldActivity = buildFieldActivity(activity)
 
-  $: object = fields.reduce((acc, next) => {
-    if (next.name) {
-      acc[next.name] = next.value
+  $: fullObject = fields.reduce((acc, next) => {
+    acc[next.name] = next.value
+    return acc
+  }, {})
+
+  $: object = Object.entries(fullObject).reduce((acc, [key, next]) => {
+    if (key) {
+      acc[key] = next
     }
     return acc
   }, {})
@@ -107,7 +112,7 @@
 </script>
 
 <!-- Builds Objects with Key Value Pairs. Useful for building things like Request Headers. -->
-{#if Object.keys(object || {}).length > 0}
+{#if Object.keys(fullObject || {}).length > 0}
   {#if headings}
     <div class="container" class:container-active={toggle}>
       <Label {tooltip}>{keyHeading || keyPlaceholder}</Label>
diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index b9cfc788f3..a9456e7718 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -63,7 +63,6 @@
   let dynamicVariables, addVariableModal, varBinding, globalDynamicBindings
   let restBindings = getRestBindings()
   let nestedSchemaFields = {}
-  let originalQuery
 
   $: staticVariables = datasource?.config?.staticVariables || {}
 
@@ -105,6 +104,7 @@
 
   $: runtimeUrlQueries = readableToRuntimeMap(mergedBindings, breakQs)
 
+  $: originalQuery = originalQuery ?? _.cloneDeep(query)
   $: builtQuery = buildQuery(query, runtimeUrlQueries, requestBindings)
   $: isModified = JSON.stringify(originalQuery) !== JSON.stringify(builtQuery)
 
@@ -198,6 +198,10 @@
         staticVariables,
         restBindings
       )
+
+      // Force rebuilding original query
+      originalQuery = null
+
       if (isNew) {
         $goto(`../../${_id}`)
       }
@@ -489,10 +493,6 @@
       staticVariables,
       restBindings
     )
-
-    originalQuery = _.cloneDeep(
-      buildQuery(query, runtimeUrlQueries, requestBindings)
-    )
   })
 </script>