diff --git a/organize/work/README.txt b/organize/work/README.txt
index fb58f72..1f4409d 100644
--- a/organize/work/README.txt
+++ b/organize/work/README.txt
@@ -94,10 +94,10 @@ by calling the form controller's update method
   False
 
   >>> list(workItems)
-  [<WorkItem ['36', 1, '33', '2008-12-28 19:15', 'finished']:
+  [<WorkItem ['36', 1, '33', '2008-12-28 18:00', 'finished']:
    {'comment': u'Comment', 'end': 1230491700, 'description': u'Description',
-    'created': ..., 'creator': '33', 'assigned': ...,
-    'start': 1230487200, 'duration': 4500, 'effort': 900}>]
+    'created': ..., 'creator': '33', 'start': 1230487200,
+    'duration': 4500, 'effort': 900}>]
 
   >>> from loops.organize.work.browser import WorkItemView, WorkItemsView
   >>> wi01 = workItems['0000001']
diff --git a/organize/work/browser.py b/organize/work/browser.py
index 33cdc32..f464583 100644
--- a/organize/work/browser.py
+++ b/organize/work/browser.py
@@ -84,7 +84,7 @@ class WorkItemsView(BaseWorkItemsView, NodeView):
             return result
         for wi in workItems.query(task=util.getUidForObject(target)):
             result.append(WorkItemDetails(self, wi))
-        return result
+        return sorted(result, key=lambda x: x.track.timeStamp)
 
 
 class UserWorkItems(BaseWorkItemsView, ConceptView):
@@ -106,7 +106,7 @@ class UserWorkItems(BaseWorkItemsView, ConceptView):
         for target in self.context.getParents([self.defaultPredicate]):
             for wi in workItems.query(userName=util.getUidForObject(target)):
                 result.append(WorkItemDetails(self, wi))
-        return result
+        return sorted(result, key=lambda x: x.track.timeStamp)
 
 
 # single work items
diff --git a/organize/work/setup.py b/organize/work/setup.py
index b017841..b4cedea 100644
--- a/organize/work/setup.py
+++ b/organize/work/setup.py
@@ -31,5 +31,5 @@ class SetupManager(BaseSetupManager):
 
     def setup(self):
         records = self.context.getRecordManager()
-        work = self.addObject(records, TrackingStorage, 'work',
-                                   trackFactory=WorkItem)
+        if 'work' not in records:
+            records['work'] = TrackingStorage(trackFactory=WorkItem)