diff --git a/app/assets/javascripts/discourse/templates/search.hbs b/app/assets/javascripts/discourse/templates/search.hbs
index dbf7f7c8fa..6ad3c15955 100644
--- a/app/assets/javascripts/discourse/templates/search.hbs
+++ b/app/assets/javascripts/discourse/templates/search.hbs
@@ -1,35 +1,32 @@
-{{view 'search-text-field' value=term searchContextEnabled=searchContextEnabled searchContext=searchContext id="search-term"}}
-<div class='search-context'>
+{{view "search-text-field" value=term searchContextEnabled=searchContextEnabled searchContext=searchContext id="search-term"}}
+<div class="search-context">
   {{#if searchContext}}
     <label>
-    {{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}}
+      {{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}}
     </label>
   {{/if}}
-  <a href="#" class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n 'show_help'}}</a>
+  <a href class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n "show_help"}}</a>
 </div>
 {{#if loading}}
-  <div class='searching'>{{loading-spinner}}</div>
+  <div class="searching">{{loading-spinner}}</div>
 {{else}}
   <div class="results">
-  {{#unless noResults}}
+  {{#if noResults}}
+    <div class="no-results">
+      {{i18n "search.no_results"}}
+    </div>
+  {{else}}
     {{#each resultType in content.resultTypes}}
       <ul>
-        <li class='heading row'>
-          {{resultType.name}}
-        </li>
-        {{view 'search-results-type' type=resultType.type displayType=resultType.displayType content=resultType.results}}
+        <li class="heading row">{{resultType.name}}</li>
+        {{view "search-results-type" type=resultType.type displayType=resultType.displayType content=resultType.results}}
       </ul>
-        <div class='no-results'>
-            {{#if resultType.more}}
-                <a href='#' class='filter' {{action "moreOfType" resultType.type bubbles=false}}>{{i18n 'show_more'}} <i class="fa fa-chevron-down"></i></a>
-            {{else}}
-            {{/if}}
-        </div>
+      <div class="no-results">
+        {{#if resultType.more}}
+          <a href class="filter" {{action "moreOfType" resultType.type bubbles=false}}>{{i18n "show_more"}} {{fa-icon "chevron-down"}}</a>
+        {{/if}}
+      </div>
     {{/each}}
-  {{else}}
-    <div class='no-results'>
-      {{i18n 'search.no_results'}}
-    </div>
-  {{/unless}}
+  {{/if}}
   </div>
 {{/if}}