--- templating.py.original	2005-01-13 11:03:44.000000000 +0000
+++ templating.py	2005-01-13 11:06:46.000000000 +0000
@@ -477,12 +477,12 @@
         return klass(self._client, self.classname, itemid)
 
     def properties(self, sort=1):
-        ''' Return HTMLProperty for all of this class' properties.
-        '''
+        """ Return HTMLProperty for all of this class' properties.
+        """
         l = []
-        for name, prop in self._props.items():
-            for klass, htmlklass in propclasses:
-                if isinstance(prop, hyperdb.Multilink):
+        for name, prop in self._props.items(): 
+            for klass, htmlklass in propclasses: 
+                if isinstance(prop, hyperdb.Multilink): 
                     value = []
                 else:
                     value = None
@@ -1953,7 +1953,7 @@
 '''%d
 
     def indexargs_form(self, columns=1, sort=1, group=1, filter=1,
-            filterspec=1):
+            filterspec=1,search_text=1):
         ''' return the current index args as form elements '''
         l = []
         sc = self.special_char
@@ -1984,7 +1984,7 @@
                         l.append(s%(k, ','.join(v)))
                 else:
                     l.append(s%(k, v))
-        if self.search_text:
+        if self.search_text and search_text:
             l.append(s%(sc+'search_text', self.search_text))
         l.append(s%(sc+'pagesize', self.pagesize))
         l.append(s%(sc+'startwith', self.startwith))