diff --git a/pylons_app/templates/search/search.html b/pylons_app/templates/search/search.html
--- a/pylons_app/templates/search/search.html
+++ b/pylons_app/templates/search/search.html
@@ -46,7 +46,7 @@
 					h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))}</div>
 				</div>
 				<div class="code-body">
-					<pre>${h.literal(sr['content_short'])}</pre>
+					<pre>${h.literal(sr['content_short_hl'])}</pre>
 				</div>
 			</div>
 		</div>
@@ -59,11 +59,13 @@
 			</div>		
 			%endif
 			
-		%endif
+		%endif		
 	%endfor
-
-	
-	
+	%if c.cur_query:
+	<div class="pagination-wh pagination-left">
+		${c.formated_results.pager('$link_previous ~2~ $link_next')}
+	</div>	
+	%endif
 </div>
 
 </%def>