diff --git a/templates/not_found.production.html.ep b/templates/not_found.production.html.ep
index eebf7c6..953ab43 100644
--- a/templates/not_found.production.html.ep
+++ b/templates/not_found.production.html.ep
@@ -1,3 +1,4 @@
+% my $msg = stash('msg') // loc('notFound');
 % layout 'main', title => 'KorAP: ' . loc('notFound');
 
 <p id="no-results"><%= $msg %></p>
diff --git a/templates/partial/header.html.ep b/templates/partial/header.html.ep
index 017d818..e363989 100644
--- a/templates/partial/header.html.ep
+++ b/templates/partial/header.html.ep
@@ -16,7 +16,10 @@
     <!-- Search in the following virtual collection -->
     <div id="vc-view"></div>
     <%= loc 'in' %>
-    %= hidden_field 'vc-name' => stash('vc-name'), id => 'vc-name' 
+    %# TODO: Create 'align' parameter
+    %# TODO: Create 'show' parameter with comma separated list
+    %= hidden_field 'cs' => stash('cs'), id => 'collection-show'
+    %= hidden_field 'collection-name' => stash('collection-name'), id => 'collection-name' 
     %= text_field 'collection', id => 'collection'
 
     <%= loc 'with' %>
diff --git a/templates/search.html.ep b/templates/search.html.ep
index f34f00f..4673c0e 100644
--- a/templates/search.html.ep
+++ b/templates/search.html.ep
@@ -1,19 +1,18 @@
 % layout 'main', title => loc('searchtitle', q => search->query, ql => search->query_language);
 
-<div class="resultinfo">
+<div id="resultinfo">
   <div id="pagination"><%= pagination(search->start_page, search->total_pages, url_with->query(['p' => '{page}'])) =%></div>
-
+  <p class="found">\
 % my $found = search->total_results;
 % if ($found != -1) {
 %   my $found_text = loc('numf', number => $found);
 %   if (search->time_exceeded) {
 %     $found_text = '> ' . $found_text;
 %   };
-  <p class="found"><span id="total-results"><%= $found_text %></span> <%= loc('matchCount', found => $found) %></p>
+<span id="total-results"><%= $found_text %></span> <%= loc('matchCount', found => $found) %>\
 %# <% if (search->benchmark) { %> (~ <%= search->benchmark %>)<% } %>
-% } else {
-  <p></p>
 % };
+</p>
 </div>
 
 %= include 'query'