diff --git a/blocks/header/header.css b/blocks/header/header.css
index f11d9f7f..fb81ba53 100644
--- a/blocks/header/header.css
+++ b/blocks/header/header.css
@@ -279,6 +279,13 @@ header nav#nav .nav-tools {
   grid-area: tools;
 }
 
+header nav#nav .nav-tools .button {
+  background: none;
+  border: none;
+  padding: 10px;
+  margin: 0;
+}
+
 /* breadcrumbs */
 header .breadcrumbs {
   display: none;
diff --git a/blocks/search/search.js b/blocks/search/search.js
index 29bc6759..e9d9ff1f 100644
--- a/blocks/search/search.js
+++ b/blocks/search/search.js
@@ -121,11 +121,11 @@ function clearSearchResults(block) {
 
 function clearSearch(block) {
   clearSearchResults(block);
-  if (window.history.pushState) {
+  if (window.history.replaceState) {
     const url = new URL(window.location.href);
     url.search = '';
     searchParams.delete('q');
-    window.history.pushState({}, '', url.toString());
+    window.history.replaceState({}, '', url.toString());
   }
 }
 
@@ -191,10 +191,10 @@ function filterData(searchTerms, data) {
 async function handleSearch(e, block, config) {
   const searchValue = e.target.value;
   searchParams.set('q', searchValue);
-  if (window.history.pushState) {
+  if (window.history.replaceState) {
     const url = new URL(window.location.href);
     url.search = searchParams.toString();
-    window.history.pushState({}, '', url.toString());
+    window.history.replaceState({}, '', url.toString());
   }
 
   if (searchValue.length < 3) {
diff --git a/scripts/scripts.js b/scripts/scripts.js
index 114fe006..84f08c80 100644
--- a/scripts/scripts.js
+++ b/scripts/scripts.js
@@ -43,8 +43,8 @@ async function loadFonts() {
   }
 }
 
-function autolinkModals(main) {
-  main.addEventListener('click', async (e) => {
+function autolinkModals(element) {
+  element.addEventListener('click', async (e) => {
     const origin = e.target.closest('a');
 
     if (origin && origin.href && origin.href.includes('/modals/')) {
@@ -62,7 +62,6 @@ function autolinkModals(main) {
 function buildAutoBlocks(main) {
   try {
     buildHeroBlock(main);
-    autolinkModals(main);
   } catch (error) {
     // eslint-disable-next-line no-console
     console.error('Auto Blocking failed', error);
@@ -93,6 +92,7 @@ async function loadEager(doc) {
   if (getMetadata('breadcrumbs').toLowerCase() === 'true') {
     document.body.classList.add('breadcrumbs-enabled');
   }
+
   const main = doc.querySelector('main');
   if (main) {
     decorateMain(main);
@@ -115,6 +115,8 @@ async function loadEager(doc) {
  * @param {Element} doc The container element
  */
 async function loadLazy(doc) {
+  autolinkModals(doc);
+
   const main = doc.querySelector('main');
   await loadBlocks(main);