Index: openacs-4/packages/search/search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v
diff -u -r1.43 -r1.43.2.1
--- openacs-4/packages/search/search.info	27 Oct 2014 16:41:54 -0000	1.43
+++ openacs-4/packages/search/search.info	5 Sep 2015 10:58:48 -0000	1.43.2.1
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.9.0d1" url="http://openacs.org/repository/download/apm/search-5.9.0d1.apm">
+    <version name="5.9.0d2" url="http://openacs.org/repository/download/apm/search-5.9.0d2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Site wide search</summary>
         <release-date>2013-10-01</release-date>
@@ -18,8 +18,9 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="search" version="5.9.0d1"/>
+        <provides url="search" version="5.9.0d2"/>
         <requires url="acs-service-contract" version="5.9.0d1"/>
+        <requires url="acs-templating" version="5.9.0d5"/>
 
         <callbacks>
             <callback type="after-instantiate"  proc="search::install::after_instantiate"/>
Index: openacs-4/packages/search/lib/navbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/lib/navbar.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/search/lib/navbar.tcl	27 Oct 2014 16:41:54 -0000	1.5
+++ openacs-4/packages/search/lib/navbar.tcl	5 Sep 2015 10:58:48 -0000	1.5.2.1
@@ -47,3 +47,5 @@
     append link "&num=$num"
     template::multirow append results_paginator [expr {$__i + 1}] $link [expr {$__i == $current_result_page}]
 }
+
+ad_return_template [template::themed_template /packages/search/lib/navbar]
Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/search/www/search.adp	14 Jul 2015 22:36:41 -0000	1.18
+++ openacs-4/packages/search/www/search.adp	5 Sep 2015 10:58:48 -0000	1.18.2.1
@@ -38,7 +38,7 @@
   <div id="search-info">
     <p class="subtitle">#search.Searched_for_query#</p>
     <p class="times">
-      #search.Results# <strong>@low@-@high@</strong> #search.of_about# <strong>@count@</strong>#search.________Search_took# <strong>@elapsed@</strong> #search.seconds# 
+      #search.Results# <strong>@low@-@high@</strong> #search.of_about# <strong>@result.count@</strong>#search.________Search_took# <strong>@elapsed@</strong> #search.seconds# 
     </p>
   </div>
   <div id="search-results">