diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp
index bf12d1e..1a52be5 100644
--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@@ -482,7 +482,7 @@ int main(int argc, char **argv) {
 
 	if (hasSearchIndex) {
 	  searcher->setProtocolPrefix("/");
-	  searcher->setSearchProtocolPrefix("/search");
+	  searcher->setSearchProtocolPrefix("/search?");
 	  searcher->setContentHumanReadableId(humanReadableId);
 	  searchers[humanReadableId] = searcher;
 	}
diff --git a/static/results.tmpl b/static/results.tmpl
index ee00230..37a4f24 100644
--- a/static/results.tmpl
+++ b/static/results.tmpl
@@ -104,7 +104,7 @@
     
     <TMPL_loop results>
 	  <li>
-	    <a href="<TMPL_var protocolPrefix><TMPL_var url>"><TMPL_var title></a>
+	    <a href="<TMPL_var protocolPrefix><TMPL_var contentId>/<TMPL_var url>"><TMPL_var title></a>
 	    <cite><TMPL_if snippet><TMPL_var snippet>...</TMPL_if></cite>
 	    <TMPL_if wordCount><div class="informations"><TMPL_var wordCount> words</div></TMPL_if>
 	  </li>
@@ -115,15 +115,15 @@
   <div class="footer">
     <ul>
       <TMPL_if (resultLastPageStart>0)>
-	<li><a href="<TMPL_var searchProtocolPrefix>pattern=<TMPL_var searchPattern>&start=0&end=<TMPL_var resultRange>">◀</a></li>
+	<li><a href="<TMPL_var searchProtocolPrefix>content=<TMPL_var contentId>&pattern=<TMPL_var searchPattern>&start=0&end=<TMPL_var resultRange>">◀</a></li>
       </TMPL_if>
       <TMPL_loop pages>
-      <li><a <TMPL_if selected>class="selected"</TMPL_if> href="<TMPL_var searchProtocolPrefix>pattern=<TMPL_var searchPattern>&start=<TMPL_var start>&end=<TMPL_var end>"><TMPL_var label></a></li>
+      <li><a <TMPL_if selected>class="selected"</TMPL_if> href="<TMPL_var searchProtocolPrefix>content=<TMPL_var contentId>&pattern=<TMPL_var searchPattern>&start=<TMPL_var start>&end=<TMPL_var end>"><TMPL_var label></a></li>
       </TMPL_LOOP>
       <TMPL_if (resultLastPageStart>0)>
-	<li><a href="<TMPL_var searchProtocolPrefix>pattern=<TMPL_var searchPattern>&start=<TMPL_var resultLastPageStart>&end=<TMPL_var (resultLastPageStart+resultRange)>">▶</a></li>
+	<li><a href="<TMPL_var searchProtocolPrefix>content=<TMPL_var contentId>&pattern=<TMPL_var searchPattern>&start=<TMPL_var resultLastPageStart>&end=<TMPL_var (resultLastPageStart+resultRange)>">▶</a></li>
       </TMPL_if>
-    </ul>
-  </div>
+    </ul> 
+ </div>
 </body>
 </html>