diff --git a/package-lock.json b/package-lock.json
index e273bc9b..3664000a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,6 +24,7 @@
     "ext/htm-live": {
       "name": "htmx-live",
       "version": "0.0.1-alpha",
+fs      "extraneous": true,
       "license": "BSD-0-Clause",
       "dependencies": {
         "htmx": "*"
@@ -51,10 +52,6 @@
         "terser": "^5.36.0"
       }
     },
-    "ext/quirks/node_modules/htmx": {
-      "resolved": "",
-      "link": true
-    },
     "node_modules/@babel/code-frame": {
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
@@ -2897,23 +2894,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/htmx": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/htmx/-/htmx-0.0.2.tgz",
-      "integrity": "sha512-FfUo3ynRYr6Ra4vqmS4Nq9g47607FSmvHYCOuU8bvbW8s4kPMhAmCbMBjuW2cEZI6DauaFNZKinfgV91cc9Feg==",
-      "license": "MIT",
-      "bin": {
-        "htmx": "htmx.js"
-      }
-    },
-    "node_modules/htmx-live": {
-      "resolved": "ext/htm-live",
-      "link": true
-    },
-    "node_modules/htmx-quirks-mode": {
-      "resolved": "ext/quirks",
-      "link": true
-    },
     "node_modules/http-assert": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/http-assert/-/http-assert-1.5.0.tgz",
diff --git a/src/htmx.js b/src/htmx.js
index 4bdab46b..15eefd27 100644
--- a/src/htmx.js
+++ b/src/htmx.js
@@ -1390,7 +1390,7 @@ var htmx = (() => {
                 strip.append(...(fragment.firstElementChild.content || fragment.firstElementChild).childNodes);
                 fragment = strip;
             }
-            
+
             let pantry = this.__handlePreservedElements(fragment);
             let parentNode = target.parentNode;
             let newContent = [...fragment.childNodes]
@@ -1558,7 +1558,7 @@ var htmx = (() => {
             let targetElt = context.target ?
                 this.__resolveTarget(sourceElt || document.body, context.target) : sourceElt;
 
-            if ((context.target && !targetElt) || (context.source && !sourceElt)) {
+            if ((context.target && !targetElt) && (context.source && !sourceElt)) {
                 return Promise.reject(new Error('Element not found'));
             }
 
@@ -1606,7 +1606,6 @@ var htmx = (() => {
                 } else {
                     this.ajax('GET', path, {
                         target: 'body',
-                        swap: 'outerHTML',
                         request: {headers: {'HX-History-Restore-Request': 'true'}}
                     });
                 }
diff --git a/www/static/js/htmx.js b/www/static/js/htmx.js
index df77d0d9..3b2e1267 100644
--- a/www/static/js/htmx.js
+++ b/www/static/js/htmx.js
@@ -1558,7 +1558,7 @@ var htmx = (() => {
             let targetElt = context.target ?
                 this.#resolveTarget(sourceElt || document.body, context.target) : sourceElt;
 
-            if ((context.target && !targetElt) || (context.source && !sourceElt)) {
+            if ((context.target && !targetElt) && (context.source && !sourceElt)) {
                 return Promise.reject(new Error('Element not found'));
             }
 
@@ -1606,7 +1606,6 @@ var htmx = (() => {
                 } else {
                     this.ajax('GET', path, {
                         target: 'body',
-                        swap: 'outerHTML',
                         request: {headers: {'HX-History-Restore-Request': 'true'}}
                     });
                 }
diff --git a/www/templates/base.html b/www/templates/base.html
index adf3ebcb..fcc403bc 100644
--- a/www/templates/base.html
+++ b/www/templates/base.html
@@ -58,7 +58,7 @@
         <!-- Right side actions -->
         <div class="flex items-center gap-4">
             <!-- Search -->
-            <form action="https://google.com/search" role="search" aria-label="Sitewide" title="Search htmx.org (via Google)" class="hidden lg:flex group text-sm">
+            <form hx-boost="false" action="https://google.com/search" role="search" aria-label="Sitewide" title="Search htmx.org (via Google)" class="hidden lg:flex group text-sm">
                 <label class="relative os9-input cursor-text">
                     <input type="hidden" name="q" value="+[inurl:https://htmx.org]">
                     <input type="text" name="q" aria-label="Search htmx.org (via Google)" placeholder="     Search" class="peer"