diff --git a/ChangeLog b/ChangeLog
index 8c646e515..0b7f2be56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-30  Don Allingham  <don@gramps-project.org>
+	* src/DataViews.py/_PersonView.py: don't add handles of top level
+	objects
+	* src/GrampsWidgets.py: handle both types and tuples
+
 2006-04-30  Brian Matherly  <brian@gramps-project.org>
 	* src/plugins/CountAncestors.py: Use positive numbers for generations to be 
 	  consistent with the rest of GRAMPS
diff --git a/src/DataViews/_PersonView.py b/src/DataViews/_PersonView.py
index 0006e79fe..4bf937fd6 100644
--- a/src/DataViews/_PersonView.py
+++ b/src/DataViews/_PersonView.py
@@ -638,7 +638,8 @@ class PersonView(PageView.PersonNavView):
         for path in paths:
             node = self.model.on_get_iter(path)
             handle = self.model.on_get_value(node, PeopleModel.COLUMN_INT_ID)
-            mlist.append(handle)
+            if handle:
+                mlist.append(handle)
         return mlist
 
     def remove_from_person_list(self,person):
diff --git a/src/GrampsWidgets.py b/src/GrampsWidgets.py
index 7eb6bae1a..b9f8a540a 100644
--- a/src/GrampsWidgets.py
+++ b/src/GrampsWidgets.py
@@ -384,8 +384,11 @@ class MonitoredDataType:
             return (value[0],'')
 
     def update(self):
-        if self.get_val():
-            self.sel.set_values(self.get_val())
+        val = self.get_val()
+        if type(val) == tuple :
+            self.sel.set_values(val)
+        else:
+            self.sel.set_values((int(val),str(val)))
 
     def on_change(self, obj):
         value = self.fix_value(self.sel.get_values())