Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/browser_templates/containermanagepage.pt
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/browser_templates/containermanagepage.pt	(revision 12822)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/browser_templates/containermanagepage.pt	(revision 12823)
@@ -41,20 +41,15 @@
         <tr tal:repeat="value view/hitlist">
       	  <td>
-            <input type="checkbox" name="entries" tal:attributes="value python:value[0].__name__" />
+            <!-- XXX: preformat values in view -->
+            <input type="checkbox" name="entries" tal:attributes="value python:value.__name__" />
           </td>
-          <td tal:content="python: value[0].payment_id[:9]">PAYMENT_ID</td>
-          <td tal:content="python: layout.formatDatetime(value[0].creation_date)">CREATION DATE</td>
-          <td tal:content="python: layout.formatDatetime(value[0].payment_date)">PAYMENT DATE</td>
-          <td tal:content="python: view.gateway_services[value[0].gateway_service].title">SERVICE</td>
-          <td tal:content="python: value[0].amount">AMOUNT</td>
-          <td tal:content="python: value[0].currency">CURRENCY</td>
-          <td tal:content="python: view.payment_states.getTerm(value[0].state).title">STATE</td>
-          <td>
-            <span tal:condition="python: value[1] is not None">
-              <a tal:attributes="href python: view.url(value[2])">
-                <span tal:content="python: value[1].title">PAYABLETITLE</span>
-              </a>
-            </span>
-          </td>
+          <td tal:content="python: value.payment_id[:9]">PAYMENT_ID</td>
+          <td tal:content="python: layout.formatDatetime(value.creation_date)">CREATION DATE</td>
+          <td tal:content="python: layout.formatDatetime(value.payment_date)">PAYMENT DATE</td>
+          <td tal:content="python: view.gateway_services[value.gateway_service].title">SERVICE</td>
+          <td tal:content="python: value.amount">AMOUNT</td>
+          <td tal:content="python: value.currency">CURRENCY</td>
+          <td tal:content="python: view.payment_states.getTerm(value.state).title">STATE</td>
+          <td tal:content="python: value.title">TITLE</td>
         </tr>
       </tbody>
@@ -68,3 +63,2 @@
   </div>
 </form>
-
Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/browser_templates/containerpage.pt
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/browser_templates/containerpage.pt	(revision 12822)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/browser_templates/containerpage.pt	(revision 12823)
@@ -33,26 +33,20 @@
       <th i18n:translate="">Currency</th>
       <th i18n:translate="">State</th>
-      <th i18n:translate="">Contract</th>
+      <th i18n:translate="">Title</th>
     </tr>
     </thead>
     <tbody>
       <tr tal:repeat="value view/hitlist">
-        <td tal:content="python: value[0].payment_id[:9]">PAYMENT_ID</td>
-        <td tal:content="python: layout.formatDatetime(value[0].creation_date)">CREATION DATE</td>
-        <td tal:content="python: layout.formatDatetime(value[0].payment_date)">PAYMENT DATE</td>
-        <td tal:content="python: view.gateway_services[value[0].gateway_service].title">SERVICE</td>
-        <td tal:content="python: value[0].amount">AMOUNT</td>
-        <td tal:content="python: value[0].currency">CURRENCY</td>
-        <td tal:content="python: view.payment_states.getTerm(value[0].state).title">STATE</td>
-        <td>
-          <span tal:condition="python: value[1] is not None">
-            <a tal:attributes="href python: view.url(value[2])">
-              <span tal:content="python: value[1].title">PAYABLETITLE</span>
-            </a>
-          </span>
-        </td>
+        <td tal:content="python: value.payment_id[:9]">PAYMENT_ID</td>
+        <td tal:content="python: layout.formatDatetime(value.creation_date)">CREATION DATE</td>
+        <td tal:content="python: layout.formatDatetime(value.payment_date)">PAYMENT DATE</td>
+        <td tal:content="python: view.gateway_services[value.gateway_service].title">SERVICE</td>
+        <td tal:content="python: value.amount">AMOUNT</td>
+        <td tal:content="python: value.currency">CURRENCY</td>
+        <td tal:content="python: view.payment_states.getTerm(value.state).title">STATE</td>
+        <td tal:content="python: value.title">TITLE</td>
+
       </tr>
     </tbody>
   </table>
 </div>
-
Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/catalog.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/catalog.py	(revision 12822)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/payments/catalog.py	(revision 12823)
@@ -24,14 +24,12 @@
 from zope.component import queryUtility
 from waeup.ikoba.interfaces import ICompany
-from waeup.ikoba.payments.interfaces import (
-    IPayment, IPayable
-    )
-from waeup.ikoba.payments.payment import (
-    find_payable_from_payable_id
-    )
+from waeup.ikoba.payments.interfaces import IPayment
 
 
 def search(query=None, searchtype=None):
-    hitlist = []
+    """Search payments catalog.
+
+    `query` gives a string we search, `searchtype` the fieldname.
+    """
     # Temporary solution to display all payments added
     if query == '*':
@@ -41,13 +39,5 @@
         results = Query().searchResults(
             Eq(('payments_catalog', searchtype), query))
-    hitlist = []
-    for payment in results:
-        payable_object = find_payable_from_payable_id(payment.payable_id)
-        if payable_object is not None:
-            payable = IPayable(payable_object)
-        else:
-            payable = None
-        hitlist.append((payment, payable, payable_object))
-    return hitlist
+    return results
 
 
