diff --git a/ChangeLog b/ChangeLog
index d3ecd2df4..d232ec950 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-20  Brian Matherly <brian@gramps-project.org>
+	* src/Filters/Rules/_HasNoteSubstrBase.py:
+	* src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py:
+	* src/Filters/Rules/Person/_HasNote.py:
+	* src/Filters/Rules/_HasNoteRegexBase.py:
+	Replace "get_note()" calls with "get_note_list()" in filters that use it.
+
 2007-07-20  Brian Matherly <brian@gramps-project.org>
 	* src/ToolTips.py (RepositoryTip:get_tip):
 	* src/plugins/WriteGeneWeb.py (write_family, write_note_of_person):
diff --git a/src/Filters/Rules/Person/_HasNote.py b/src/Filters/Rules/Person/_HasNote.py
index a19dd7a42..74153c2ea 100644
--- a/src/Filters/Rules/Person/_HasNote.py
+++ b/src/Filters/Rules/Person/_HasNote.py
@@ -45,4 +45,4 @@ class HasNote(Rule):
     category    = _('General filters')
 
     def apply(self,db,person):
-        return bool(person.get_note())
+        return bool(person.get_note_list())
diff --git a/src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py b/src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py
index 5953fdd11..d7507b036 100644
--- a/src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py
+++ b/src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py
@@ -46,7 +46,10 @@ class HasNoteMatchingSubstringOf(Rule):
     category    = _('General filters')
 
     def apply(self,db,person):
-        n = person.get_note()
-        if n:
-            return n.upper().find(self.list[0].upper()) != -1
+        notelist = person.get_note_list()
+        for notehandle in notelist:
+            note = db.get_note_from_handle(notehandle)
+            n = note.get(False)
+            if n.upper().find(self.list[0].upper()) != -1:
+                return True
         return False
diff --git a/src/Filters/Rules/_HasNoteRegexBase.py b/src/Filters/Rules/_HasNoteRegexBase.py
index b569e24af..dd6fdff8f 100644
--- a/src/Filters/Rules/_HasNoteRegexBase.py
+++ b/src/Filters/Rules/_HasNoteRegexBase.py
@@ -56,5 +56,10 @@ class HasNoteRegexBase(Rule):
             self.match = re.compile('')
 
     def apply(self,db,person):
-        n = unicode(person.get_note())
-        return self.match.match(n) != None
+        notelist = person.get_note_list()
+        for notehandle in notelist:
+            note = db.get_note_from_handle(notehandle)
+            n = unicode(note.get(False))
+            if self.match.match(n) != None:
+                return True
+        return False
diff --git a/src/Filters/Rules/_HasNoteSubstrBase.py b/src/Filters/Rules/_HasNoteSubstrBase.py
index 6a2d42ea5..85d192475 100644
--- a/src/Filters/Rules/_HasNoteSubstrBase.py
+++ b/src/Filters/Rules/_HasNoteSubstrBase.py
@@ -46,7 +46,10 @@ class HasNoteSubstrBase(Rule):
     category    = _('General filters')
 
     def apply(self,db,person):
-        n = unicode(person.get_note())
-        if n:
-            return n.upper().find(self.list[0].upper()) != -1
+        notelist = person.get_note_list()
+        for notehandle in notelist:
+            note = db.get_note_from_handle(notehandle)
+            n = unicode(note.get(False))
+            if n.upper().find(self.list[0].upper()) != -1:
+                return True
         return False