diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 856a08ced..ebe76c252 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-12  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
+	* src/GenericFilter.py (ParamFilter.apply): Set parameter list before
+	prepare (solves crash in full text search)
+	* src/gramps_main.py: Enable full text search filters again
+	
 2005-05-12  Alex Roitman  <shura@gramps-project.org>
 	* src/plugins/Check.py (cleanup_missing_photos): Typo.
 	* configure.in: Bump up the version number.
diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py
index 73d9ed9e7..3833e53e7 100644
--- a/gramps2/src/GenericFilter.py
+++ b/gramps2/src/GenericFilter.py
@@ -2379,10 +2379,10 @@ class ParamFilter(GenericFilter):
         self.param_list = [param]
 
     def apply(self,db,id_list):
-        for rule in self.flist:
-            rule.prepare(db)
         for rule in self.flist:
             rule.set_list(self.param_list)
+        for rule in self.flist:
+            rule.prepare(db)
         result = GenericFilter.apply(self,db,id_list)
         for rule in self.flist:
             rule.reset()
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index ce45f960d..e1d0a3c26 100755
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -1033,15 +1033,15 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
         all.add_rule(GenericFilter.IsWitness([]))
         filter_list.append(all)
 
-#         all = GenericFilter.ParamFilter()
-#         all.set_name(_("Any textual record contains..."))
-#         all.add_rule(GenericFilter.HasTextMatchingSubstringOf([]))
-#         filter_list.append(all)
+        all = GenericFilter.ParamFilter()
+        all.set_name(_("Any textual record contains..."))
+        all.add_rule(GenericFilter.HasTextMatchingSubstringOf([]))
+        filter_list.append(all)
 
-#         all = GenericFilter.ParamFilter()
-#         all.set_name(_("Any textual record matches regular expression..."))
-#         all.add_rule(GenericFilter.HasTextMatchingRegexpOf([]))
-#         filter_list.append(all)
+        all = GenericFilter.ParamFilter()
+        all.set_name(_("Any textual record matches regular expression..."))
+        all.add_rule(GenericFilter.HasTextMatchingRegexpOf([]))
+        filter_list.append(all)
 
         self.filter_model = GenericFilter.FilterStore(filter_list)
         self.filter_list.set_model(self.filter_model)