diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 0935e7666..10bd81135 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-26  Julio Sanchez  <jsanchez@users.sourceforge.net>
+	* src/GenericFilter.py: Fix uninitialized ancestor_cache in
+	HasCommonAncestorWithFilterMatch, fix or-ing filters
+
 2005-06-24  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/PeopleView.py (build_people_context_menu): Workaround to get a
 	proper german translation.
diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py
index 3e3dc3470..a7a525ee5 100644
--- a/gramps2/src/GenericFilter.py
+++ b/gramps2/src/GenericFilter.py
@@ -956,6 +956,7 @@ class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith):
 
     def __init__(self,list):
         HasCommonAncestorWith.__init__(self,list)
+        self.ancestor_cache = {}
 
     def init_ancestor_cache(self,db):
         filt = MatchesFilter(self.list)
@@ -1949,7 +1950,7 @@ class GenericFilter:
                 count += 1
         return count != 1
 
-    def and_or(self,db,person):
+    def or_test(self,db,person):
         for rule in self.flist:
             if rule.apply(db,person):
                 return True