diff --git a/3rdparty.md b/3rdparty.md
index 8a00e183..fafc6cf6 100644
--- a/3rdparty.md
+++ b/3rdparty.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: 3rd Party Portals
+search: true
 ---
 
 These portals are not Microsoft owned or controlled, but provide free and useful tools.
diff --git a/404.md b/404.md
index 216140b7..19d8f138 100644
--- a/404.md
+++ b/404.md
@@ -2,6 +2,7 @@
 layout: page
 title: 404 - Page not found
 permalink: /404
+search: false
 ---
 
 Sorry, we can't find that page that you're looking for. You can try again by going [back to the homepage]({{ site.baseurl }}/).
diff --git a/_includes/quickfilter.html b/_includes/quickfilter.html
index edfad2f6..ac7ea048 100644
--- a/_includes/quickfilter.html
+++ b/_includes/quickfilter.html
@@ -127,15 +127,17 @@
     };
     var scriptLoaded = loadScriptAsync();
     scriptLoaded.then(function () {
-      document.querySelectorAll(window.location.hash).forEach(function (anchorLink) {
-        if (anchorLink.parentNode.hidden === false) {
-          anchorLink.scrollIntoView({
-            preventScroll: true,
-            behavior: "smooth",
-            block: "start",
-          });
-        }
-      });
+      if (window.location.hash != "") {
+        document.querySelectorAll(window.location.hash).forEach(function (anchorLink) {
+          if (anchorLink.parentNode.hidden === false) {
+            anchorLink.scrollIntoView({
+              preventScroll: true,
+              behavior: "smooth",
+              block: "start",
+            });
+          }
+        });
+      }
     });
   };
 </script>
diff --git a/_layouts/default.html b/_layouts/default.html
index d7743247..fb6dae27 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -50,13 +50,7 @@ <h2>{{ site.description | default: site.github.project_tagline }}</h2>
                 <a href="{{ site.github.repository_url }}" class="btn" target="_blank"></span>GitHub</a>
                 <a href="{{ site.baseurl }}/about" class="btn"></span>About</a>
             </section>
-            {% if page.title contains "Portals" %}
-            {% include quickfilter.html %}
-            {% endif %}
-            {% if page.title contains "Training Links" %}
-            {% include quickfilter.html %}
-            {% endif %}
-            {% if page.title contains "Licensing Links" %}
+            {% if page.search %}
             {% include quickfilter.html %}
             {% endif %}
             {% include tenantid.html %}
@@ -67,7 +61,7 @@ <h2>{{ site.description | default: site.github.project_tagline }}</h2>
     <div class="container">
         <section id="main_content">
             {{ content }}
-            {% if page.title contains "Portals" %}
+            {% if page.search %}
             {% include nomatches.html %}
             {% endif %}
         </section>
@@ -79,4 +73,4 @@ <h2>{{ site.description | default: site.github.project_tagline }}</h2>
 
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/about.md b/about.md
index 6eae5c93..760c6673 100644
--- a/about.md
+++ b/about.md
@@ -2,6 +2,7 @@
 layout: page
 title: About
 permalink: /about/
+search: false
 ---
 
 This site is not owned or endorsed by Microsoft in any way. If you have feedback or found a site we don't have listed, visit our [GitHub page](https://github.com/adamfowlerit/msportals.io) and let us know there.
diff --git a/favorites.md b/favorites.md
index 6d7ea33f..051636c7 100644
--- a/favorites.md
+++ b/favorites.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Saved Links
+search: false
 ---
 
 <script type="text/javascript">
diff --git a/index.md b/index.md
index 7c03c085..5c3c5d82 100644
--- a/index.md
+++ b/index.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Administrator Portals
+search: true
 ---
 Welcome to this community driven project to list all of Microsoft's portals in one place.
 
diff --git a/licensing.md b/licensing.md
index 918284a3..3ae698c8 100644
--- a/licensing.md
+++ b/licensing.md
@@ -1,6 +1,7 @@
 ---
 layout: page
-title: Licensing Portals and Links
+title: Licensing Links
+search: true
 ---
 
 This area is a work in progress! Please provide feeback through GitHub. 
diff --git a/training.md b/training.md
index bcd28121..d4ec5ff0 100644
--- a/training.md
+++ b/training.md
@@ -1,6 +1,7 @@
 ---
 layout: page
-title: Training Portals and Links
+title: Training Links
+search: true
 ---
 
 
diff --git a/userportals.md b/userportals.md
index 907988e6..d25de7d7 100644
--- a/userportals.md
+++ b/userportals.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: User Portals
+search: true
 ---
 
 These Microsoft portals are for end users.
diff --git a/usgovt.md b/usgovt.md
index e5441f46..0eed8ec3 100644
--- a/usgovt.md
+++ b/usgovt.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Government Portals
+search: true
 ---
 
 GCC, GCC High and DoD links to Microsoft Portals