diff --git a/reporter/README.txt b/reporter/README.txt
index 2071f09..5f5bc12 100644
--- a/reporter/README.txt
+++ b/reporter/README.txt
@@ -42,12 +42,14 @@ empty.
   >>> list(r1.cells)
   []
 
+So let's assign a schema to the result set.
+
   >>> from cybertools.composer.schema.schema import Schema
   >>> from cybertools.composer.schema.field import Field
   >>> rset.schema = Schema(Field(u'firstName'), Field(u'lastName'), Field(u'birthDate'))
   >>> r1 = rset.rows.next()
   >>> [c.text for c in r1.cells]
-  ['Smith', 'John', '1956-08-01']
+  [u'Smith', u'John', u'1956-08-01']
 
 For the browser presentation we can also use a browser view providing
 the result set with extended attributes:
diff --git a/reporter/browser/macros.pt b/reporter/browser/macros.pt
index 390ee55..4fc3248 100644
--- a/reporter/browser/macros.pt
+++ b/reporter/browser/macros.pt
@@ -17,7 +17,7 @@
         <h2 tal:content="item/title">Something</h2><br />
         <table class="listing">
           <tr>
-            <th tal:repeat="field result/schema"
+            <th tal:repeat="field result/schema/fields"
                 tal:content="field/title"
                 i18n:translate="">Fieldname</th>
           </tr>
@@ -25,7 +25,7 @@
             <tal:item define="class python: repeat['row'].odd() and 'even' or 'odd'">
               <tr tal:attributes="class class">
                 <td valign="top"
-                    repeat="cell row/cells">
+                    tal:repeat="cell row/cells">
                   <a href="#"
                      tal:omit-tag="not:cell/url"
                      tal:attributes="href cell/url;
diff --git a/reporter/browser/report.py b/reporter/browser/report.py
index fea9dd6..c7addcc 100644
--- a/reporter/browser/report.py
+++ b/reporter/browser/report.py
@@ -26,6 +26,7 @@ from zope import interface, component
 from zope.app.pagetemplate import ViewPageTemplateFile
 from zope.cachedescriptors.property import Lazy
 
+from cybertools.reporter.resultset import ResultSet
 from loops.browser.common import BaseView
 
 
@@ -38,7 +39,7 @@ class DetailView(BaseView):
 
     @Lazy
     def macro(self):
-        return self.template.macros('detail')
+        return self.template.macros['detail']
 
     @Lazy
     def resultSet(self):
@@ -56,10 +57,9 @@ class ListingView(BaseView):
 
     @Lazy
     def macro(self):
-        return self.template.macros('listing')
+        return self.template.macros['listing']
 
     @Lazy
     def resultSet(self):
-        result = ResultSet()
-        return result
+        return ResultSet(self.context)
 
diff --git a/reporter/resultset.py b/reporter/resultset.py
index 37332ff..ae6cf06 100644
--- a/reporter/resultset.py
+++ b/reporter/resultset.py
@@ -44,7 +44,9 @@ class Cell(object):
 
     @property
     def text(self):
-        return str(self.value)
+        if isinstance(self.value, unicode):
+            return self.value
+        return unicode(str(self.value))
 
     @property
     def token(self):