diff --git a/.template-lintrc.js b/.template-lintrc.js
index 801225fd338..17279244f34 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -13,6 +13,7 @@ module.exports = {
     "no-unbound": true,
     "simple-unless": true,
     "no-triple-curlies": true,
-    "no-partial": true
+    "no-partial": true,
+    "no-html-comments": true
   }
 };
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index 528ed5af240..eaab7e615f5 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -4,15 +4,15 @@
 
     <pre class="badge-errors">{{errors}}</pre>
 
-    <!--
-    TODO we want some help pages for this, link to those instead
-    <p>
-      {{i18n "admin.badges.preview.error_help"}}
-    </p>
-    <ul>
-      <li><a href="https://meta.discourse.org/t/triggered-custom-badge-queries/19336">https://meta.discourse.org/t/triggered-custom-badge-queries/19336</a></li>
-    </ul>
-    -->
+    {{!--
+      TODO we want some help pages for this, link to those instead
+      <p>
+        {{i18n "admin.badges.preview.error_help"}}
+      </p>
+      <ul>
+        <li><a href="https://meta.discourse.org/t/triggered-custom-badge-queries/19336">https://meta.discourse.org/t/triggered-custom-badge-queries/19336</a></li>
+      </ul>
+    --}}
 
   {{else}}
     <p class="grant-count">
diff --git a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
index 36e1b5a4cbb..89df8f94e37 100644
--- a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
@@ -24,7 +24,7 @@
   </div>
 </div>
 
-<!-- disable these super-advanced searches for now
+{{!-- disable these super-advanced searches for now
 <div class="container">
   <div class="control-group pull-left">
     <label class="control-label" for="search-in-group">{{i18n "search.advanced.in_group.label"}}</label>
@@ -38,8 +38,7 @@
       {{badge-selector badgeFinder=badgeFinder badgeNames=searchedTerms.badge single="true" canReceiveUpdates="true"}}
     </div>
   </div>
-</div>
--->
+</div> --}}
 
 {{#if siteSettings.tagging_enabled}}
   <div class="container advanced-search-tag-group">
diff --git a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
index 4fb9e462f9f..782ebe9cabe 100644
--- a/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bookmark.hbs
@@ -57,7 +57,7 @@
 
     <div class="control-group">
       {{d-button label="bookmarks.save" class="btn-primary" action=(action "saveAndClose")}}
-      {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}}      
+      {{d-modal-cancel close=(action "closeWithoutSavingBookmark")}}
     </div>
   {{/conditional-loading-spinner}}
 {{/d-modal-body}}