diff --git a/lib/html/static/js/search.js b/lib/html/static/js/search.js
index af47ac8ca9..03ecaf555f 100644
--- a/lib/html/static/js/search.js
+++ b/lib/html/static/js/search.js
@@ -82,6 +82,11 @@ var FileLoader = ( function () {
         * number. */
         num = parseInt(num);
 
+        if (previous_search) {
+            loadFile("", num)
+            return
+        }
+
         // Remove previously highlighted lines.
         var highlights = $($('#filecode')[0]).find('span.highlight');
         for (high=0; high<highlights.length; high++) {
diff --git a/lib/html/template/rose-bush/view-search.html b/lib/html/template/rose-bush/view-search.html
index ae6bb1fe67..6a578e0b46 100644
--- a/lib/html/template/rose-bush/view-search.html
+++ b/lib/html/template/rose-bush/view-search.html
@@ -18,20 +18,20 @@
 {% else -%}
 <div class="col-md-11">
 {% endif -%}
-{% if not file_content -%}
-{% set lines = lines | map(
-    'replace', 'DEBUG', '<span class="nocode text-muted">DEBUG</span>') | map(
-    'replace', 'INFO', '<span class="nocode text-info">INFO</span>') | map(
-    'replace', 'ERROR', '<span class="nocode text-dander">ERROR</span>') | map(
-    'replace', 'CRITICAL', '<span class="nocode text-dander">CRITICAL</span>') | map(
-    'replace', 'WARNING', '<span class="nocode text-warning">WARNING</span>') -%}
-{% endif -%}
 <pre id="filecode" {% if file_content %}class="prettyprint lang-{{file_content}}"{% endif -%}>
 {% for line in lines -%}
 {% for part in line -%}
-{% if loop.index % 2 == 1 -%}{{part}}{% else 
--%}<span class="highlight">{{part}}</span>{% endif -%}
+{% if not file_content -%}
+{% set part = part | replace(
+    'DEBUG', '<span class="nocode text-muted">DEBUG</span>') | replace(
+    'INFO', '<span class="nocode text-info">INFO</span>') | replace(
+    'ERROR', '<span class="nocode text-dander">ERROR</span>') | replace(
+    'CRITICAL', '<span class="nocode text-dander">CRITICAL</span>') | replace(
+    'WARNING', '<span class="nocode text-warning">WARNING</span>') -%}
 {% endif -%}
+{% if loop.index % 2 == 1 -%}{{part}}{% else 
+-%}<span class="highlight">{{part}}</span>{%
+endif -%}
 {% endfor -%}
 {{ "" }} 
 {% endfor -%}
diff --git a/lib/html/template/rose-bush/view.html b/lib/html/template/rose-bush/view.html
index edf65d14b7..969a1ca5b1 100644
--- a/lib/html/template/rose-bush/view.html
+++ b/lib/html/template/rose-bush/view.html
@@ -60,16 +60,16 @@ <h1>{{path}}</h1>
 </pre>
 </div>
 <div class="col-md-11">
-{% if not file_content -%}
-{% set lines = lines | map(
-    'replace', 'DEBUG', '<span class="nocode text-muted">DEBUG</span>') | map(
-    'replace', 'INFO', '<span class="nocode text-info">INFO</span>') | map(
-    'replace', 'ERROR', '<span class="nocode text-dander">ERROR</span>') | map(
-    'replace', 'CRITICAL', '<span class="nocode text-dander">CRITICAL</span>') | map(
-    'replace', 'WARNING', '<span class="nocode text-warning">WARNING</span>') -%}
-{% endif -%}
 <pre id="filecode"{% if file_content %} class="prettyprint lang-{{file_content}}"{% endif %}>
 {% for line in lines -%}
+{% if not file_content -%}
+{% set line = line | replace(
+    'DEBUG', '<span class="nocode text-muted">DEBUG</span>') | replace(
+    'INFO', '<span class="nocode text-info">INFO</span>') | replace(
+    'ERROR', '<span class="nocode text-dander">ERROR</span>') | replace(
+    'CRITICAL', '<span class="nocode text-dander">CRITICAL</span>') | replace(
+    'WARNING', '<span class="nocode text-warning">WARNING</span>') -%}
+{% endif -%}
 {% if mode == "tags" -%}
 {{line}}
 {% else -%}