diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index d23470a01..7f4b3ff52 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-03  Alex Roitman  <shura@gramps-project.org>
+	* src/DisplayTabs/_BackRefList.py (find_node): Use class name.
+	* src/DisplayTabs/_BackRefModel.py (__init__, load_model): Add new
+	column to keep both class name and translation.
+
 2006-08-02  Alex Roitman  <shura@gramps-project.org>
 	* configure.in: Disable scrollkeeper update in the packager mode.
 
diff --git a/gramps2/src/DisplayTabs/_BackRefList.py b/gramps2/src/DisplayTabs/_BackRefList.py
index 399a8c42f..af216ad14 100644
--- a/gramps2/src/DisplayTabs/_BackRefList.py
+++ b/gramps2/src/DisplayTabs/_BackRefList.py
@@ -106,7 +106,7 @@ class BackRefList(EmbeddedList):
     def find_node(self):
         (model, node) = self.selection.get_selected()
         try:
-            return (model.get_value(node, 0), model.get_value(node, 3))
+            return (model.get_value(node, 4), model.get_value(node, 3))
         except:
             return (None, None)
     
diff --git a/gramps2/src/DisplayTabs/_BackRefModel.py b/gramps2/src/DisplayTabs/_BackRefModel.py
index 110a44d21..2a66d2f73 100644
--- a/gramps2/src/DisplayTabs/_BackRefModel.py
+++ b/gramps2/src/DisplayTabs/_BackRefModel.py
@@ -44,7 +44,7 @@ import Utils
 class BackRefModel(gtk.ListStore):
 
     def __init__(self, sref_list, db):
-        gtk.ListStore.__init__(self, str, str, str, str)
+        gtk.ListStore.__init__(self, str, str, str, str, str)
         self.db = db
         self.sref_list = sref_list
         self.idle = 0
@@ -94,6 +94,8 @@ class BackRefModel(gtk.ListStore):
 
             # dtype is the class name, i.e. is English
             # We need to use localized string in the model.
-            self.append(row=[_(dtype), gid, name, handle])
+            # we also need to keep class names to get the object type,
+            # but we don't need to show that in the view.
+            self.append(row=[_(dtype), gid, name, handle, dtype])
             yield True
         yield False