diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index cf1e2349a..ab3bc0a3d 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -3,6 +3,14 @@
 	Family.get_text_data_child_list): Add missing lists.
 	* src/GenericFilter.py (FullTextSearch): Correct description.
 
+	* src/GenericFilter.py (HasTextMatchingSubstringOf):
+	Rename FullTextSearch as well as its descriptions.
+	* src/gramps_main.py: Change string for filter menu.
+	* src/plugins/FilterEditor.py (EditRule.__init__): Hide window while
+	drawing.
+	* src/DateEdit.py (DateEditorDialog.__init__): Hide window while
+	drawing.
+
 2005-03-15  Richard Taylor <rjt-gramps@thegrindstone.me.uk>
 	* src/Makefile.am : Added TreeTip.py to list of installed modules.
 	* src/TreeTip.py: New module that implements tooltips on TreeView rows.
diff --git a/gramps2/src/DateEdit.py b/gramps2/src/DateEdit.py
index b9754dd29..8044fcacb 100644
--- a/gramps2/src/DateEdit.py
+++ b/gramps2/src/DateEdit.py
@@ -188,6 +188,7 @@ class DateEditorDialog:
 
         self.top = gtk.glade.XML(const.dialogFile, "date_edit","gramps" )
         self.top_window = self.top.get_widget('date_edit')
+        self.top_window.hide()
         title = self.top.get_widget('title')
         Utils.set_titles(self.top_window,title,_('Date selection'))
 
diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py
index f65832a46..713589ca6 100644
--- a/gramps2/src/GenericFilter.py
+++ b/gramps2/src/GenericFilter.py
@@ -57,9 +57,7 @@ import Date
 import DateHandler
 import NameDisplay
 from TransTable import TransTable
-from Utils import for_each_ancestor
-from Utils import probably_alive
-from Utils import get_source_referents
+from Utils import for_each_ancestor,probably_alive,get_source_referents
 
 #-------------------------------------------------------------------------
 #
@@ -1828,12 +1826,12 @@ class IsWitness(Rule):
                             self.map.append(w.get_value())
 
 #-------------------------------------------------------------------------
-# "FullTextSearch"
+# "HasTextMatchingSubstringOf"
 #-------------------------------------------------------------------------
 
 
-class FullTextSearch(Rule):
-    """Full-text serach for ..."""
+class HasTextMatchingSubstringOf(Rule):
+    """Rule that checks for string matches in any textual information"""
 
     labels = [_('Substring:')]
 
@@ -1850,7 +1848,7 @@ class FullTextSearch(Rule):
         self.family_map = {}
 
     def name(self):
-        return 'Full-text serach for ...'
+        return 'Has text matching substring of'
     
     def description(self):
         return _("Matches persons whose records contain text matching a substring")
@@ -2119,7 +2117,7 @@ tasks = {
     unicode(_("People marked private"))                : PeoplePrivate,
     unicode(_("Witnesses"))                            : IsWitness,
 
-    unicode(_("Full-text search ..."))                 : FullTextSearch,
+    unicode(_("Has text matching substring"))          : HasTextMatchingSubstringOf,
 }
 
 #-------------------------------------------------------------------------
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index e5c1b0589..c32d91352 100755
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -948,8 +948,8 @@ class Gramps:
         filter_list.append(all)
 
         all = GenericFilter.ParamFilter()
-        all.set_name(_("Full-text search ..."))
-        all.add_rule(GenericFilter.FullTextSearch([]))
+        all.set_name(_("Any textual record contains..."))
+        all.add_rule(GenericFilter.HasTextMatchingSubstringOf([]))
         filter_list.append(all)
 
         self.filter_model = GenericFilter.FilterStore(filter_list)
diff --git a/gramps2/src/plugins/FilterEditor.py b/gramps2/src/plugins/FilterEditor.py
index a83229b10..65f933fa6 100644
--- a/gramps2/src/plugins/FilterEditor.py
+++ b/gramps2/src/plugins/FilterEditor.py
@@ -573,6 +573,7 @@ class EditRule:
         self.active_rule = val
         self.rule = gtk.glade.XML(const.filterFile,'rule_editor',"gramps")
         self.window = self.rule.get_widget('rule_editor')
+        self.window.hide()
         self.valuebox = self.rule.get_widget('valuebox')
         self.rname = self.rule.get_widget('ruletree')
         self.rule_name = self.rule.get_widget('rulename')