diff --git a/src/PeopleModel.py b/src/PeopleModel.py
index fbd09e77e..ec6c5ab7c 100644
--- a/src/PeopleModel.py
+++ b/src/PeopleModel.py
@@ -74,8 +74,9 @@ class PeopleModel(gtk.GenericTreeModel):
         self.top_visible = {}
         self.rebuild_data(data_filter)
     
-    def rebuild_data(self,data_filter):
-        self.data_filter = data_filter
+    def rebuild_data(self,data_filter=None):
+        if data_filter:
+            self.data_filter = data_filter
         temp_top_path2iter = []
         temp_iter2path = {}
         temp_path2iter = {}
diff --git a/src/ReadXML.py b/src/ReadXML.py
index 531153455..91e8a4c60 100644
--- a/src/ReadXML.py
+++ b/src/ReadXML.py
@@ -1052,7 +1052,7 @@ class GrampsParser:
             d = 0
 
         if attrs.has_key("cformat"):
-            cal = Date.Date.calendar.index(attrs['calendar'])
+            cal = Date.Date.calendar_names.index(attrs['calendar'])
         else:
             cal = Date.CAL_GREGORIAN