--- a/zpt/viewer_text.zpt	Tue Feb 28 10:39:21 2012 +0100
+++ b/zpt/viewer_text.zpt	Tue Feb 28 18:21:59 2012 +0100
@@ -63,11 +63,11 @@
       <!-- end of col-main -->
 
       <!-- right-side search results -->
-      <div class="col search" tal:condition="query">
+      <div class="col results" tal:condition="query">
         <!--"BEGIN SEARCH RESULTS"  -->
         <div class="options">
           <h4>Search results</h4>
-          <div tal:content="structure python:here.getResultsPage(mode=queryType,query=query,pn=1,pageinfo=pageinfo,docinfo=docinfo)"/>
+          <div metal:use-macro="here/template/search_template/macros/results_div"/>
         </div>
       </div>
 
@@ -91,7 +91,7 @@
                       value="dict" tal:attributes="checked python:'dict' in viewLayers" />
                     Dictionary
                   </li>
-                  <li tal:condition="query">
+                  <li tal:condition="python:query">
                     <input type="checkbox" class="autosubmit" name="viewLayer"
                       value="search"
                       tal:attributes="checked python:'search' in viewLayers" /> Search hits
@@ -128,6 +128,7 @@
             <!-- query text -->
             <input type="text" name="query" tal:attributes="value query"/>
             <input type="submit" value="Search"/>
+            <a tal:attributes="href python:here.getLink('query',None)">Clear</a>
             <ul>
                 <li>
                   <input type="radio" name="queryType" value="fulltext"