diff --git a/src/Filters/Rules/Event/_HasGallery.py b/src/Filters/Rules/Event/_HasGallery.py
index 5bd040460..affb00aec 100755
--- a/src/Filters/Rules/Event/_HasGallery.py
+++ b/src/Filters/Rules/Event/_HasGallery.py
@@ -35,10 +35,10 @@ from gettext import gettext as _
 from Filters.Rules._HasGalleryBase import HasGalleryBase
 
 #-------------------------------------------------------------------------
-# "Events who have images"
+# "Events who have media object reference"
 #-------------------------------------------------------------------------
 class HasGallery(HasGalleryBase):
-    """Rule that checks for events who have Media object reference"""
+    """Rule that checks for event who has media object reference"""
 
-    name        = _('Event with images')
-    description = _("Matches event with image in the gallery")
+    name        = _('Events with media')
+    description = _("Matches events with media object in the gallery")
diff --git a/src/Filters/Rules/Event/_HasType.py b/src/Filters/Rules/Event/_HasType.py
index 9b7cfc808..8d0611406 100644
--- a/src/Filters/Rules/Event/_HasType.py
+++ b/src/Filters/Rules/Event/_HasType.py
@@ -44,8 +44,8 @@ class HasType(Rule):
     """Rule that checks for an event of a particular type."""
 
     labels      = [ _('Event type:') ]
-    name        = _('Event with the particular type')
-    description = _("Matches event with the particular type ")
+    name        = _('Events with the particular type')
+    description = _("Matches events with the particular type ")
     category    = _('General filters')
 
     def apply(self, db, event):
diff --git a/src/Filters/Rules/Family/_HasGallery.py b/src/Filters/Rules/Family/_HasGallery.py
index f80cb982b..31cbb4b33 100755
--- a/src/Filters/Rules/Family/_HasGallery.py
+++ b/src/Filters/Rules/Family/_HasGallery.py
@@ -35,10 +35,10 @@ from gettext import gettext as _
 from Filters.Rules._HasGalleryBase import HasGalleryBase
 
 #-------------------------------------------------------------------------
-# "Families who have images"
+# "Families who have media object reference"
 #-------------------------------------------------------------------------
 class HasGallery(HasGalleryBase):
-    """Rule that checks for families who have Media object reference"""
+    """Rule that checks for family who has media object reference"""
 
-    name        = _('Family with images')
-    description = _("Matches family with images in the gallery")
+    name        = _('Families with media')
+    description = _("Matches families with media object in the gallery")
diff --git a/src/Filters/Rules/Family/_HasLDS.py b/src/Filters/Rules/Family/_HasLDS.py
index e73ceb580..d80da7efd 100755
--- a/src/Filters/Rules/Family/_HasLDS.py
+++ b/src/Filters/Rules/Family/_HasLDS.py
@@ -43,5 +43,5 @@ from Filters.Rules._HasLDSBase import HasLDSBase
 class HasLDS(HasLDSBase):
     """Rule that checks for family with a LDS event"""
 
-    name        = _('Family with LDS event')
-    description = _("Matches family with LDS event")
+    name        = _('Families with LDS event')
+    description = _("Matches families with LDS event")
diff --git a/src/Filters/Rules/Family/_HasReferenceCountOf.py b/src/Filters/Rules/Family/_HasReferenceCountOf.py
index 23d40066f..066f107cf 100644
--- a/src/Filters/Rules/Family/_HasReferenceCountOf.py
+++ b/src/Filters/Rules/Family/_HasReferenceCountOf.py
@@ -40,6 +40,6 @@ from Filters.Rules._HasReferenceCountBase import HasReferenceCountBase
 class HasReferenceCountOf(HasReferenceCountBase):
     """Family objects with a reference count of <count>"""
 
-    name        = _('Family objects with a reference count of <count>')
-    description = _("Matches family objects with a certain reference count")
+    name        = _('Families with a reference count of <count>')
+    description = _("Matches families objects with a certain reference count")
 
diff --git a/src/Filters/Rules/Family/_HasRelType.py b/src/Filters/Rules/Family/_HasRelType.py
index 869f35aef..f30e010e0 100644
--- a/src/Filters/Rules/Family/_HasRelType.py
+++ b/src/Filters/Rules/Family/_HasRelType.py
@@ -44,8 +44,8 @@ class HasRelType(Rule):
     """Rule that checks for a person with a particular personal attribute"""
 
     labels      = [ _('Relationship type:') ]
-    name        = _('Family with the relationship type')
-    description = _("Matches family with the relationship type "
+    name        = _('Families with the relationship type')
+    description = _("Matches families with the relationship type "
                     "of a particular value")
     category    = _('General filters')
 
diff --git a/src/Filters/Rules/Person/_HasGallery.py b/src/Filters/Rules/Person/_HasGallery.py
new file mode 100644
index 000000000..f8633b5e4
--- /dev/null
+++ b/src/Filters/Rules/Person/_HasGallery.py
@@ -0,0 +1,44 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2008  Brian G. Matherly
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+# $Id$
+
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from gettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from Filters.Rules._HasGalleryBase import HasGalleryBase
+
+#-------------------------------------------------------------------------
+# "People with media object reference "
+#-------------------------------------------------------------------------
+class HavePhotos(HasGalleryBase):
+    """Rule that checks for person who has media object reference"""
+
+    name        = _('People with media')
+    description = _("Matches people with media object in the gallery")
diff --git a/src/Filters/Rules/Person/_HasIdOf.py b/src/Filters/Rules/Person/_HasIdOf.py
index ef41e1a54..d086ad820 100644
--- a/src/Filters/Rules/Person/_HasIdOf.py
+++ b/src/Filters/Rules/Person/_HasIdOf.py
@@ -42,5 +42,5 @@ from Filters.Rules import HasGrampsId
 class HasIdOf(HasGrampsId):
     """Rule that checks for a person with a specific GRAMPS ID"""
 
-    name        = _('People with <Id>')
-    description = _("Matches people with a specified GRAMPS ID")
+    name        = _('Person with <Id>')
+    description = _("Matches person with a specified GRAMPS ID")
diff --git a/src/Filters/Rules/Person/_MatchIdOf.py b/src/Filters/Rules/Person/_MatchIdOf.py
index d4355989b..58337d5e0 100644
--- a/src/Filters/Rules/Person/_MatchIdOf.py
+++ b/src/Filters/Rules/Person/_MatchIdOf.py
@@ -43,8 +43,8 @@ class MatchIdOf(Rule):
     """Rule that checks for a person with a specific GRAMPS ID"""
 
     labels      = [ _('ID:') ]
-    name        = _('People with <Id>')
-    description = _("Matches people with a specified GRAMPS ID")
+    name        = _('Person with <Id>')
+    description = _("Matches person with a specified GRAMPS ID")
     category    = _('General filters')
 
     def apply(self,db,person):
diff --git a/src/Filters/Rules/Person/__init__.py b/src/Filters/Rules/Person/__init__.py
index d0d451093..62704a701 100644
--- a/src/Filters/Rules/Person/__init__.py
+++ b/src/Filters/Rules/Person/__init__.py
@@ -39,6 +39,7 @@ from _HasDeath import HasDeath
 from _HasEvent import HasEvent
 from _HasFamilyAttribute import HasFamilyAttribute
 from _HasFamilyEvent import HasFamilyEvent
+from _HasGallery import HavePhotos
 from _HasIdOf import HasIdOf
 from _HasLDS import HasLDS
 from _HasNameOf import HasNameOf
@@ -53,7 +54,6 @@ from _HasUnknownGender import HasUnknownGender
 from _HasMarkerOf import HasMarkerOf
 from _HaveAltFamilies import HaveAltFamilies
 from _HaveChildren import HaveChildren
-from _HavePhotos import HavePhotos
 from _IncompleteNames import IncompleteNames
 from _IsAncestorOf import IsAncestorOf
 from _IsAncestorOfFilterMatch import IsAncestorOfFilterMatch
diff --git a/src/Filters/Rules/Place/_HasGallery.py b/src/Filters/Rules/Place/_HasGallery.py
index de79f6372..131ff2a0e 100755
--- a/src/Filters/Rules/Place/_HasGallery.py
+++ b/src/Filters/Rules/Place/_HasGallery.py
@@ -35,10 +35,10 @@ from gettext import gettext as _
 from Filters.Rules._HasGalleryBase import HasGalleryBase
 
 #-------------------------------------------------------------------------
-# "Places who have images"
+# "Places who have media object reference"
 #-------------------------------------------------------------------------
 class HasGallery(HasGalleryBase):
-    """Rule that checks for places who have Media object reference"""
+    """Rule that checks for place who has media object reference"""
 
-    name        = _('Place with images')
-    description = _("Matches place with image in the gallery")
+    name        = _('Places with media')
+    description = _("Matches places with media object in the gallery")
diff --git a/src/Filters/Rules/Place/_HasReferenceCountOf.py b/src/Filters/Rules/Place/_HasReferenceCountOf.py
index 9ffa3f38e..e28b4367e 100644
--- a/src/Filters/Rules/Place/_HasReferenceCountOf.py
+++ b/src/Filters/Rules/Place/_HasReferenceCountOf.py
@@ -40,6 +40,6 @@ from Filters.Rules._HasReferenceCountBase import HasReferenceCountBase
 class HasReferenceCountOf(HasReferenceCountBase):
     """Place objects with a reference count of <count>"""
 
-    name        = _('Place objects with a reference count of <count>')
-    description = _("Matches place objects with a certain reference count")
+    name        = _('Places with a reference count of <count>')
+    description = _("Matches places with a certain reference count")
 
diff --git a/src/Filters/Rules/Repository/_HasNoteRegexp.py b/src/Filters/Rules/Repository/_HasNoteRegexp.py
index b93a7d76c..1ec2829c0 100644
--- a/src/Filters/Rules/Repository/_HasNoteRegexp.py
+++ b/src/Filters/Rules/Repository/_HasNoteRegexp.py
@@ -39,7 +39,7 @@ from Filters.Rules._HasNoteRegexBase import HasNoteRegexBase
 #-------------------------------------------------------------------------
 class HasNoteRegexp(HasNoteRegexBase):
 
-    name        = _('Repositoriess having notes '
+    name        = _('Repositories having notes '
                     'containing <regular expression>')
     description = _("Matches repositories whose notes contain text "
                     "matching a regular expression")