diff --git a/search/browser/base.py b/search/browser.py
similarity index 100%
rename from search/browser/base.py
rename to search/browser.py
diff --git a/search/browser/__init__.py b/search/browser/__init__.py
deleted file mode 100644
index 4bc90fb..0000000
--- a/search/browser/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""
-$Id$
-"""
-
diff --git a/search/browser/configure.zcml b/search/browser/configure.zcml
deleted file mode 100644
index 5d56003..0000000
--- a/search/browser/configure.zcml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- $Id$ -->
-
-<configure
-    xmlns:zope="http://namespaces.zope.org/zope"
-    xmlns:browser="http://namespaces.zope.org/browser"
-    i18n_domain="zope">
-
-  <!-- named templates -->
-
-  <zope:adapter
-      factory="loops.search.browser.base.search_macros"
-      for="loops.browser.common.BaseView"
-      name="loops.search_macros" />
-
-  <!-- the real view -->
-
-  <zope:adapter
-      name="search"
-      for="loops.interfaces.IConcept
-           zope.publisher.interfaces.browser.IBrowserRequest"
-      provides="zope.interface.Interface"
-      factory="loops.search.browser.base.Search"
-      permission="zope.View"
-      />
-
-</configure>
diff --git a/search/browser/search.pt b/search/browser/search.pt
deleted file mode 100644
index 5ea62cb..0000000
--- a/search/browser/search.pt
+++ /dev/null
@@ -1,22 +0,0 @@
-<metal:search define-macro="search">
-  <div>
-    <h3 tal:attributes="class string:content-$level;
-                        ondblclick item/openEditWindow">
-      Search
-    </h3>
-
-    <div metal:define-macro="search_form">
-      <fieldset class="box">
-        <form action=".">
-          <input name="search" />
-        </form>
-      </fieldset>
-    </div>
-
-    <div metal:define-macro="search_results">
-      <fieldset class="box">
-      </fieldset>
-    </div>
-
-  </div>
-</metal:search>
diff --git a/search/configure.zcml b/search/configure.zcml
index 7ee4eed..f1f22ae 100644
--- a/search/configure.zcml
+++ b/search/configure.zcml
@@ -1,10 +1,28 @@
 <!-- $Id$ -->
 
 <configure
-    xmlns="http://namespaces.zope.org/zope"
+    xmlns:zope="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
     i18n_domain="zope"
     >
 
-  <include package=".browser" />
+  <!-- named templates -->
+
+  <zope:adapter
+      factory="loops.search.browser.search_macros"
+      for="loops.browser.common.BaseView"
+      name="loops.search_macros" />
+
+  <!-- the real view -->
+
+  <zope:adapter
+      name="search"
+      for="loops.interfaces.IConcept
+           zope.publisher.interfaces.browser.IBrowserRequest"
+      provides="zope.interface.Interface"
+      factory="loops.search.browser.Search"
+      permission="zope.View"
+      />
+
 
 </configure>
diff --git a/search/search.pt b/search/search.pt
new file mode 100644
index 0000000..bfbbae8
--- /dev/null
+++ b/search/search.pt
@@ -0,0 +1,84 @@
+<metal:search define-macro="search">
+  <div id="search"
+       tal:define="template nocall:item/template">
+    <h3 tal:attributes="class string:content-$level;
+                        ondblclick item/openEditWindow">
+      Search
+    </h3>
+
+    <div metal:define-macro="search_form">
+      <fieldset class="box">
+        <form action=".">
+          <table cellpadding="3">
+            <tal:block define="search_selection string:type">
+              <metal:row use-macro="template/macros/search_row" />
+            </tal:block>
+            <tal:block define="search_selection string:text">
+              <metal:row use-macro="template/macros/search_row" />
+            </tal:block>
+            <tr>
+              <td colspan="2">
+                <input type="button" name="search.add.1" value=" Add filter " />
+              </td>
+            </tr>
+          </table>
+        </form>
+      </fieldset>
+    </div>
+
+    <div metal:define-macro="search_results">
+      <fieldset class="box">
+        Search results
+      </fieldset>
+    </div>
+
+  </div>
+</metal:search>
+
+
+<tr metal:define-macro="search_row" id="search.row.1.1">
+  <td>
+    <input type="button" value="&minus;" />&nbsp;
+  </td>
+  <td tal:define="selection search_selection | string:type">
+    <select>
+      <option value="type"
+              tal:attributes="selected python: selection=='type'">Type</option>
+      <option value="text"
+              tal:attributes="selected python: selection=='text'">Text</option>
+      <option value="attribute">Attribute value</option>
+      <option value="concept">Concept</option>
+    </select>
+    <input metal:use-macro="template/macros/?selection" />
+  </td>
+</tr>
+
+
+<metal:text define-macro="text">
+  <div id="search.text.1.1">
+    <input type="checkbox"
+           name="search.text.title.1.1" id="search.text.title.1.1" />
+    <label for="search.text.title.1.1">Title</label>
+    <input type="checkbox"
+           name="search.text.full.1.1" id="search.text.full.1.1" />
+    <label for="search.text.full.1.1">Full text</label>&nbsp;&nbsp;
+    <label for="search.text.text.1.1">Search words:</label>
+    <input type="text" name="search.text.text.1.1" />
+    <input type="text" name="search.text.text.1.1" />
+    <input type="button" name="search.text.add.1.1" value="+" />&nbsp;
+  </div>
+</metal:text>
+
+
+<metal:text define-macro="type">
+  <div id="search.type.1.2">
+    <label for="search.text.1.1">Type:</label>
+    <select type="text" name="search.type.text.1.2">
+      <option value=".loops/concepts/topic">Topic</option>
+      <option value="loops.resource.Document">Document</option>
+    </select>
+    <input type="button" name="search.type.add.1.2" value="+" />&nbsp;
+  </div>
+</metal:text>
+
+