diff --git a/browser/resource.py b/browser/resource.py
index ba3f53c..d780832 100644
--- a/browser/resource.py
+++ b/browser/resource.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2007 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2010 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -109,7 +109,6 @@ class MediaAssetEditForm(EditForm):
 
 class ResourceView(BaseView):
 
-    #template = ViewPageTemplateFile('resource_macros.pt')
     template = resource_macros
 
     @Lazy
diff --git a/organize/stateful/browser.py b/organize/stateful/browser.py
index a75d9ab..b07c26d 100644
--- a/organize/stateful/browser.py
+++ b/organize/stateful/browser.py
@@ -31,7 +31,7 @@ from cybertools.stateful.interfaces import IStateful, IStatesDefinition
 from loops.browser.common import BaseView
 from loops.browser.concept import ConceptView
 from loops.expert.query import And, Or, State, Type, getObjects
-from loops.search.browser import template as search_template
+from loops.search.browser import search_template
 from loops.util import _
 
 
diff --git a/search/browser.py b/search/browser.py
index df25d54..fde45f6 100644
--- a/search/browser.py
+++ b/search/browser.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2009 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2010 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -41,18 +41,20 @@ from loops import util
 from loops.util import _
 
 
-template = ViewPageTemplateFile('search.pt')
+search_template = ViewPageTemplateFile('search.pt')
 
 
 class Search(BaseView):
 
     maxRowNum = 0
 
-    template = template
+    @Lazy
+    def search_macros(self):
+        return self.controller.getTemplateMacros('search', search_template)
 
     @Lazy
     def macro(self):
-        return template.macros['search']
+        return self.search_macros['search']
 
     @property
     def rowNum(self):
@@ -159,9 +161,13 @@ class Search(BaseView):
 class SearchResults(NodeView):
     """ Provides results as inner HTML """
 
+    @Lazy
+    def search_macros(self):
+        return self.controller.getTemplateMacros('search', search_template)
+
     @Lazy
     def macro(self):
-        return template.macros['search_results']
+        return self.search_macros['search_results']
 
     def __call__(self):
         return innerHtml(self)
diff --git a/search/search.pt b/search/search.pt
index 73c1473..6b55dff 100644
--- a/search/search.pt
+++ b/search/search.pt
@@ -1,6 +1,6 @@
 <metal:search define-macro="search">
   <div id="search"
-       tal:define="macros item/template/macros;
+       tal:define="macros item/search_macros;
                    idPrefix string:${view/itemNum}.search;
                    formId string:$idPrefix.form;
                    resultsId string:$idPrefix.results">
diff --git a/versioning/browser.py b/versioning/browser.py
index ea64db5..bd80dd0 100644
--- a/versioning/browser.py
+++ b/versioning/browser.py
@@ -28,6 +28,7 @@ from zope.app.security.interfaces import IUnauthenticatedPrincipal
 from zope.cachedescriptors.property import Lazy
 
 from loops.browser.common import BaseView
+from loops.resource import Resource
 from loops.versioning.interfaces import IVersionable
 from loops.versioning.util import getVersion
 
@@ -39,13 +40,21 @@ class ListVersions(BaseView):
 
     template = version_macros
 
+    @Lazy
+    def version_macros(self):
+        return self.controller.getTemplateMacros('versions', version_macros)
+
     @Lazy
     def macro(self):
-        return self.template.macros['versions']
+        return self.version_macros['versions']
 
     def versions(self):
         versionable = IVersionable(self.context)
         versions = versionable.versions
         for v in sorted(versions):
-            yield BaseView(versions[v], self.request)
+            if isinstance(versions[v], Resource):
+                from loops.browser.resource import ResourceView
+                yield ResourceView(versions[v], self.request)
+            else:
+                yield BaseView(versions[v], self.request)