--- a/web/views/basecomponents.py	Wed Feb 18 10:03:26 2009 +0100
+++ b/web/views/basecomponents.py	Wed Feb 18 10:03:58 2009 +0100
@@ -194,8 +194,8 @@
     to be able to filter accordingly.
     """
     id = 'etypenavigation'
-    __select__ = classmethod(chainfirst(two_etypes_rset, match_form_params))
-    form_params = ('__restrtype', '__restrtypes', '__restrrql')
+    __select__ = two_etypes_rset() | match_form_params('__restrtype', '__restrtypes',
+                                                       '__restrrql')
     visible = False # disabled by default
     
     def call(self):