diff --git a/netlify/functions/search/search.js b/netlify/functions/search/search.js
index cc8ce7b..fc15843 100644
--- a/netlify/functions/search/search.js
+++ b/netlify/functions/search/search.js
@@ -12,7 +12,7 @@ const handler = async (event) => {
     console.log('index made');
 
     let results =
-      search[0] == "#"
+      search[0] == "#" && search.length > 1
         ? index.search(`tags:${search.substring(1)}`)
         : index.search(search);
 
@@ -21,7 +21,7 @@ const handler = async (event) => {
       r.content = truncate(data[r.ref].content, 400);
       r.date = data[r.ref].date;
       r.url = data[r.ref].url;
-      r.tags = data[r.ref].tags;
+      r.tags = data[r.ref].tags.filter(x=>x!="gardenEntry" && x!="note");//Note is automatically added by 11ty. GardenEntry is used internally to mark the home page
       
       delete r.ref;
     });
diff --git a/src/helpers/constants.js b/src/helpers/constants.js
index dc6df6b..e7cea58 100644
--- a/src/helpers/constants.js
+++ b/src/helpers/constants.js
@@ -7,5 +7,6 @@ exports.ALL_NOTE_SETTINGS= [
     "dgShowFileTree",
     "dgEnableSearch",
     "dgShowToc",
-    "dgLinkPreview"
+    "dgLinkPreview",
+    "dgShowTags"
 ];
\ No newline at end of file
diff --git a/src/site/_includes/components/filetree.njk b/src/site/_includes/components/filetree.njk
index 51bd03c..c26d571 100644
--- a/src/site/_includes/components/filetree.njk
+++ b/src/site/_includes/components/filetree.njk
@@ -26,13 +26,13 @@
             x-on:resize.window="isDesktop = (window.innerWidth>=1400) ? true : false;" 
             x-data="{isDesktop: true, showFilesMobile: false}">
 
-        <div x-show.important="!isDesktop">
+        <div x-show.important="!isDesktop" style="display: none;">
             {%include "components/filetreeNavbar.njk"%}
         </div>
         
         <div x-show="showFilesMobile && !isDesktop" @click="showFilesMobile = false" style="display:none;" class="fullpage-overlay"></div>
 
-      <nav class="filetree-sidebar"  x-show.important="isDesktop || showFilesMobile" style="display: block">
+      <nav class="filetree-sidebar"  x-show.important="isDesktop || showFilesMobile" style="display: none;">
 
          <a href="/" style="text-decoration: none;">
                <h1 style="text-align:center;">{{meta.siteName}}</h1>
diff --git a/src/site/_includes/components/searchScript.njk b/src/site/_includes/components/searchScript.njk
index ef544ab..14fc91a 100644
--- a/src/site/_includes/components/searchScript.njk
+++ b/src/site/_includes/components/searchScript.njk
@@ -14,9 +14,11 @@
     window.toggleTagSearch=function(evt) {
         console.log(evt.textContent);
         const term = evt.textContent;
-        window.document.getElementById('term').value = term;
-        window.toggleSearch();
-        window.search();
+        if(term){
+            window.document.getElementById('term').value = term.trim();
+            window.toggleSearch();
+            window.search();
+        }
     }
 
     const loadingSvg = `
@@ -201,17 +203,26 @@
         resultsHTML += '<div>';
         // we need to add title, url from ref
         results.forEach(r => {
-            resultsHTML += `<div class="searchresult">
-                <a class="search-link" href="${r.url}">${r.title}</a>
-                <div onclick="window.location='${r.url}'">
-                    <div class="header-meta">
-                        <div class="header-tags">
-                            ${r.tags.map(tag=>'<a class="tag" href="JavaScript:Void(0);">#'+tag+'</a>').join("")}
+            if(r.tags && r.tags.length > 0){
+                resultsHTML += `<div class="searchresult">
+                    <a class="search-link" href="${r.url}">${r.title}</a>
+                    <div onclick="window.location='${r.url}'">
+                        <div class="header-meta">
+                            <div class="header-tags">
+                                ${r.tags.map(tag=>'<a class="tag" href="JavaScript:Void(0);">#'+tag+'</a>').join("")}
+                            </div>
                         </div>
+                        ${r.content}
                     </div>
-                    ${r.content}
-                </div>
-            </div>`;
+                </div>`;
+            } else {
+                resultsHTML += `<div class="searchresult">
+                    <a class="search-link" href="${r.url}">${r.title}</a>
+                    <div onclick="window.location='${r.url}'">
+                        ${r.content}
+                    </div>
+                </div>`;
+            }
         });
         resultsHTML += '</div>';
         resultsDiv.innerHTML = resultsHTML;
diff --git a/src/site/_includes/layouts/note.njk b/src/site/_includes/layouts/note.njk
index af48190..355765b 100644
--- a/src/site/_includes/layouts/note.njk
+++ b/src/site/_includes/layouts/note.njk
@@ -25,10 +25,10 @@ permalink: "notes/{{ page.fileSlug | slugify }}/"
         <h1>{% if title %}{{ title }}{% else %}{{ page.fileSlug }}{% endif %}</h1>
       {% endif %}
       <div class="header-meta">
-        {% if tags %}
+        {% if settings.dgShowTags === true and tags %}
           <div class="header-tags">
             {% for tag in tags %}
-              {% if tag != 'gardenEntry' %}
+              {% if tag != 'gardenEntry' and tag !='note' %}
                 <a class="tag" onclick="toggleTagSearch(this)">
                   #{{tag}}
                 </a>
diff --git a/src/site/index.11tydata.js b/src/site/index.11tydata.js
index 1ec5d96..396fe9f 100644
--- a/src/site/index.11tydata.js
+++ b/src/site/index.11tydata.js
@@ -37,6 +37,13 @@ module.exports = {
             }
             return "";
         },
+        tags: (data) => {
+            const currentnote = data.collections.gardenEntry && data.collections.gardenEntry[0];
+            if (currentnote && currentnote.data) {
+                return currentnote.data.tags;
+            }
+            return [];
+        },
         content: (data) => {
             const currentnote = data.collections.gardenEntry && data.collections.gardenEntry[0];
             if (currentnote && currentnote.template && currentnote.template.frontMatter && currentnote.template.frontMatter.content) {
diff --git a/src/site/index.njk b/src/site/index.njk
index 22f1447..ed0f11e 100644
--- a/src/site/index.njk
+++ b/src/site/index.njk
@@ -19,6 +19,21 @@
       {% if settings.dgShowInlineTitle === true %}
         <h1>{{ noteTitle  }}</h1>
       {% endif %}
+
+      <div class="header-meta">
+        {% if settings.dgShowTags === true and tags %}
+          <div class="header-tags">
+            {% for tag in tags %}
+              {% if tag != 'gardenEntry' and tag !='note' %}
+                <a class="tag" onclick="toggleTagSearch(this)">
+                  #{{tag}}
+                </a>
+              {% endif %}
+            {% endfor %}
+          </div>
+        {% endif %}
+      </div>
+
       {%- for garden in collections.gardenEntry -%}
         {{garden.templateContent | link | highlight | safe }}
       {%- endfor -%}
diff --git a/src/site/lunr.njk b/src/site/lunr.njk
index 1b7506e..5dd4074 100644
--- a/src/site/lunr.njk
+++ b/src/site/lunr.njk
@@ -9,6 +9,6 @@ eleventyExcludeFromCollections: true
 		"date":"{{ post.date }}",
 		"url":"{{ post.url }}",
 		"content": {{ post.templateContent | striptags(true) | link | jsonify | safe  }},
-		"tags": [{% if post.data.tags %}{% for tag in post.data.tags %}{% if tag != 'gardenEntry' %}"{{tag}}"{% endif %}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}]
+		"tags": [{% if post.data.tags %}{% for tag in post.data.tags %}"{{tag}}"{% if not loop.last %},{% endif %}{% endfor %}{% endif %}]
 }{% if not loop.last %},{% endif %}
 {% endfor %}]
diff --git a/src/site/styles/digital-garden-base.scss b/src/site/styles/digital-garden-base.scss
index 3193c98..145eee2 100644
--- a/src/site/styles/digital-garden-base.scss
+++ b/src/site/styles/digital-garden-base.scss
@@ -230,7 +230,7 @@ ul.task-list {
         transform: none;
         border-radius: 4px;
         margin-top: 50px;
-        max-width: 800px;
+        max-width: 700px;
         margin: auto;
         border-radius: 0;
         border-top: 2px solid var(--background-secondary); 
@@ -522,6 +522,17 @@ div[class*="callout-"] {
     white-space: normal !important;
 }
 
+.header-tags {
+    display: flex;
+    flex-wrap: wrap;
+    margin-top: 10px;
+    gap: 5px;
+}
+
+.header-meta {
+    margin-bottom: 10px;
+}
+
 div.language-ad-note,
 div.callout-note {
     .admonition-title::before {
diff --git a/src/site/styles/style.scss b/src/site/styles/style.scss
index 7712853..c507eeb 100644
--- a/src/site/styles/style.scss
+++ b/src/site/styles/style.scss
@@ -92,14 +92,3 @@ p>code {
     color: #c7254e;
     background-color: #1a1a1a;
 }
-
-.header-tags {
-    display: flex;
-    flex-wrap: wrap;
-    margin-top: 10px;
-    gap: 5px;
-}
-
-.header-meta {
-    margin-bottom: 1.8em;
-}
\ No newline at end of file