--- a/zpt/layer_text_search.zpt	Wed Aug 15 16:59:45 2012 +0200
+++ b/zpt/layer_text_search.zpt	Thu Aug 16 19:09:49 2012 +0200
@@ -16,7 +16,7 @@
     <ul>
       <metal:block metal:define-macro="layer_select_li">
         <li tal:condition="python:query"><input type="checkbox" class="autosubmit" name="viewLayer" value="search"
-          tal:attributes="checked python:'search' in viewLayers" /> Search hits</li>
+          tal:attributes="checked python:'search' in viewLayers" /> Search results</li>
       </metal:block>
     </ul>
   </div>
@@ -24,8 +24,7 @@
   <metal:block metal:define-macro="extra_column" tal:condition="python:'search' in viewLayers">
     <!-- right-side search results -->
     <div class="col results" tal:condition="query">
-      <!--"BEGIN SEARCH RESULTS"  -->
-      <div class="options">
+      <div class="result">
         <h4>Search results</h4>
         <div
           tal:define="start pageinfo/resultStart; resultsize python:docinfo.get('resultSize',0); grpsize pageinfo/resultPageSize;
@@ -33,6 +32,9 @@
           <div class="ruler" tal:define="startParam string:resultStart">
             <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
           </div>
+          <div class="query">
+            Searching "<span tal:content="query" />" (<span tal:content="queryType" />)
+          </div>
           <div class="content"
             tal:content="structure python:here.getResultsPage(mode=queryType,query=query,start=start,size=grpsize,pageinfo=pageinfo,docinfo=docinfo)" />
         </div>
@@ -41,7 +43,7 @@
   </metal:block>
 
   <metal:block metal:define-macro="options_box">
-    <!--"BEGIN SEARCH"-->
+    <!-- search options -->
     <div class="options">
       <h4>Search</h4>
       <form tal:attributes="action viewerUrl">
@@ -54,7 +56,7 @@
         <input type="hidden" name="viewLayer" value="search" />
         <!-- query text -->
         <input type="text" name="query" tal:attributes="value query" /> <br /> <input type="submit" value="Search" /> <a
-          tal:attributes="href python:here.getLink('query',None)">Clear</a>
+          tal:condition="query" tal:attributes="href python:here.getLink('query',None)">Clear</a>
         <ul>
           <li><input type="radio" name="queryType" value="fulltext" tal:attributes="checked python:queryType=='fulltext'" />
             Exact</li>
@@ -67,7 +69,7 @@
         </ul>
       </form>
     </div>
-    <!--"END SEARCH"-->
+    <!-- end search options-->
   </metal:block>
 
 </body>