diff --git a/README.md b/README.md
index 0bb53b5f..c61e396d 100755
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ Read this post For More Details => [hugo-PaperMod - Installation](https://aditya
 -   Light/Dark theme (automatic theme switch a/c to browser theme and theme-switch button).
 -   SEO Friendly.
 -   Muliple Author support.
+-   Search Page
 -   No webpack, nodejs and other depedencies required to edit the theme :)
 
 Read this post For More Details => [hugo-PaperMod - Features](https://adityatelange.github.io/hugo-PaperMod/posts/papermod/papermod-features/)
diff --git a/assets/js/fastsearch.js b/assets/js/fastsearch.js
index 3261c155..357867b2 100644
--- a/assets/js/fastsearch.js
+++ b/assets/js/fastsearch.js
@@ -49,6 +49,8 @@ document.getElementById("searchInput").onkeyup = function (e) {
         }
 
         document.getElementById("searchResults").innerHTML = resultSet;
+    } else {
+        document.getElementById("searchResults").innerHTML = '';
     }
 }
 
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 5cd64a9f..e6e894af 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -9,14 +9,12 @@
     <span>&middot;</span>
     <span>Theme <a href="https://git.io/hugopapermod" rel="noopener" target="_blank">PaperMod</a></span>
 </footer>
-<a aria-label="go to top" title="Go to Top" accesskey="g">
-    <button class="top-link" id="top-link" type="button">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 6">
-            <path d="M12 6H0l6-6z" /></svg>
-    </button>
-</a>
+<button class="top-link" id="top-link" type="button" aria-label="go to top" title="Go to Top" accesskey="g">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 6">
+        <path d="M12 6H0l6-6z" /></svg>
+</button>
 {{- partial "extend_footer.html" . -}}
-{{ if in site.Params.mainSections .Type }}
+{{ if (and (in site.Params.mainSections .Type) (ne .Layout `archives`) (ne .Layout `search`)) }}
 {{- if not .Site.Params.assets.disableFingerprinting }}
 {{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify | fingerprint }}
 <script defer src="{{ $highlight.Permalink }}" integrity="{{ $highlight.Data.Integrity }}"
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 055701f8..baaf732f 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -21,12 +21,12 @@
 <meta name="google-site-verification" content="{{ .Site.Params.analytics.google.SiteVerificationTag }}" />
 {{- end}}
 <!-- Styles -->
+{{- $stylesheet := (resources.Match "css/*.css") | resources.Concat "assets/css/stylesheet.css" | minify -}}
 {{- if not .Site.Params.assets.disableFingerprinting }}
-{{- $stylesheet := (resources.Match "css/*.css") | resources.Concat "assets/css/stylesheet.css" | minify | fingerprint -}}
+{{- $stylesheet := $stylesheet | fingerprint -}}
 <link href="{{ $stylesheet.Permalink }}" integrity="{{ $stylesheet.Data.Integrity }}" rel="preload stylesheet"
     as="style">
 {{- else}}
-{{- $stylesheet := (resources.Match "css/*.css") | resources.Concat "assets/css/stylesheet.css" | minify -}}
 <link href="{{ $stylesheet.Permalink }}" rel="preload stylesheet" as="style">
 {{- end}}
 <!-- Search -->