diff --git a/templates/failure.html.ep b/templates/failure.html.ep
index 9155c31..e1f6fb3 100644
--- a/templates/failure.html.ep
+++ b/templates/failure.html.ep
@@ -1,4 +1,4 @@
-% layout 'main', title => loc('searchtitle', q => stash('q'), ql => stash('ql')), schematype => 'SearchResultsPage';
+% layout 'main', schematype => 'SearchResultsPage';
 
 <div id="resultinfo"><p class="found"></p></div>
 
@@ -7,6 +7,7 @@
 <div id="search"></div>
 
 <p class="no-results"><%= loc('notIssued') %></p>
+
 % if (stash('err_msg')) {
 <p class="no-results"><%== loc(stash('err_msg'),stash('err_msg')) %></p>
 % }
diff --git a/templates/match_info.html.ep b/templates/match_info.html.ep
new file mode 100644
index 0000000..7731b03
--- /dev/null
+++ b/templates/match_info.html.ep
@@ -0,0 +1,11 @@
+% layout 'main', title => 'Match';
+
+<div id="resultinfo" class="found"></div>
+
+%= include 'query'
+
+<div id="search">
+  <ol class="align-left">
+%= include 'match', match => stash('results');
+  </ol>
+</div>
diff --git a/templates/search.html.ep b/templates/search.html.ep
index a349401..e73b267 100644
--- a/templates/search.html.ep
+++ b/templates/search.html.ep
@@ -1,4 +1,4 @@
-% layout 'main', title => loc('searchtitle', q => stash('q'), ql => stash('ql')), schematype => 'SearchResultsPage';
+% layout 'main', schematype => 'SearchResultsPage';
 
 <div id="resultinfo" <% if (stash('results')->size) { %> class="found"<%} %>>
   <div id="pagination"><%= pagination(stash('start_page'), stash('total_pages'), url_with->query({'p' => '{page}'})) =%></div>