diff --git a/src/ToolTips.py b/src/ToolTips.py
index 53026c7a3..2a0aee54b 100644
--- a/src/ToolTips.py
+++ b/src/ToolTips.py
@@ -124,31 +124,33 @@ class RepositoryTip(object):
 
     def get_tip(self):
         global escape
-        s = "<big><b>%s:</b>\t%s</big>\n\n"\
-            "\t<b>%s:</b>\n"\
-            "\t\t%s\n"\
-            "\t\t%s\n"\
-            "\t\t%s\n"\
-            "\t\t%s\n"\
-            "\t\t%s\n"\
-            "\t\t%s\n"\
-            "\t<b>%s:</b>\t%s\n"\
-            "\t<b>%s:</b>\t%s\n"\
-            "\t<b>%s:</b>\t%s\n"\
-            "\t<b>%s:</b>\t%s\n"\
-            % (
-            _("Repository"),escape(self._obj.get_name()),
-            _("Location"),
-            escape(self._obj.address.get_parish()),
-            escape(self._obj.address.get_city()),
-            escape(self._obj.address.get_county()),
-            escape(self._obj.address.get_state()),
-            escape(self._obj.address.get_postal_code()),
-            escape(self._obj.address.get_country()),
-            _("Telephone"), escape(self._obj.address.get_phone()),
-            _("Email"), escape(self._obj.get_email()),
-            _("Search Url"), escape(self._obj.get_search_url()),
-            _("Home Url"), escape(self._obj.get_home_url()))    
+        s = "<big><b>%s:</b>\t%s</big>\n\n" % (
+            _("Repository"),escape(self._obj.get_name()))
+        
+        addresses = self._obj.get_address_list()
+        if addresses:
+            address = addresses[0]
+            s += "\t<b>%s:</b>\n"\
+                "\t\t%s\n"\
+                "\t\t%s\n"\
+                "\t\t%s\n"\
+                "\t\t%s\n"\
+                "\t\t%s\n"\
+                "\t\t%s\n"\
+                "\t<b>%s:</b>\t%s\n"\
+                % (
+                _("Location"),
+                escape(address.get_street()),
+                escape(address.get_city()),
+                escape(address.get_county()),
+                escape(address.get_state()),
+                escape(address.get_postal_code()),
+                escape(address.get_country()),
+                _("Telephone"), escape(address.get_phone()))
+
+        # Get the Urls
+        for url in self._obj.get_url_list():
+            s += "\t<b>%s:</b>\t%s\n" % (url.get_type(), escape(url.get_path()))
 
         # Get the notes
         notelist = self._obj.get_note_list()
diff --git a/src/gui/views/listview.py b/src/gui/views/listview.py
index e27c083e3..9db38ea36 100644
--- a/src/gui/views/listview.py
+++ b/src/gui/views/listview.py
@@ -276,9 +276,9 @@ class ListView(NavigationView):
             self.__display_column_sort()
             self.goto_active(None)
 
-            if const.USE_TIPS and self.model.tooltip_column is not None:
+            if const.USE_TIPS and self.model.tooltip_column() is not None:
                 self.tooltips = TreeTips.TreeTips(
-                    self.list, self.model.tooltip_column, True)
+                    self.list, self.model.tooltip_column(), True)
             self.dirty = False
             cput4 = time.clock()
             self.uistate.show_filter_results(self.dbstate, 
diff --git a/src/gui/views/treemodels/eventmodel.py b/src/gui/views/treemodels/eventmodel.py
index acebba9ec..40425a2e2 100644
--- a/src/gui/views/treemodels/eventmodel.py
+++ b/src/gui/views/treemodels/eventmodel.py
@@ -96,7 +96,7 @@ class EventModel(FlatBaseModel):
             self.column_handle,
             self.column_tooltip,
             ]
-        FlatBaseModel.__init__(self, db, scol, order, tooltip_column=9,
+        FlatBaseModel.__init__(self, db, scol, order, tooltip_column=8,
                            search=search, skip=skip, sort_map=sort_map)
 
     def on_get_n_columns(self):
diff --git a/src/gui/views/treemodels/familymodel.py b/src/gui/views/treemodels/familymodel.py
index 64215b4d9..25bdff7e2 100644
--- a/src/gui/views/treemodels/familymodel.py
+++ b/src/gui/views/treemodels/familymodel.py
@@ -86,7 +86,7 @@ class FamilyModel(FlatBaseModel):
             self.column_marker_text, 
             self.column_marker_color, 
             ]
-        FlatBaseModel.__init__(self, db, scol, order, tooltip_column=6, 
+        FlatBaseModel.__init__(self, db, scol, order, tooltip_column=7, 
                            search=search, skip=skip, sort_map=sort_map)
 
     def marker_column(self):
diff --git a/src/gui/views/treemodels/repomodel.py b/src/gui/views/treemodels/repomodel.py
index b9f5fefaa..803b93c7f 100644
--- a/src/gui/views/treemodels/repomodel.py
+++ b/src/gui/views/treemodels/repomodel.py
@@ -40,6 +40,8 @@ import gtk
 #
 #-------------------------------------------------------------------------
 import gen.lib
+import const
+import ToolTips
 import Utils
 from gui.views.treemodels.flatbasemodel import FlatBaseModel
 
@@ -213,7 +215,15 @@ class RepositoryModel(FlatBaseModel):
         return u""
 
     def column_tooltip(self,data):
-        return ""
+        if const.USE_TIPS:
+            try:
+                t = ToolTips.TipFromFunction(self.db, lambda:
+                                    self.db.get_repository_from_handle(data[0]))
+            except:
+                log.error("Failed to create tooltip.",exc_info=True)
+            return t
+        else:
+            return u''
 
     def sort_change(self,data):
         return "%012x" % data[7]
diff --git a/src/gui/views/treemodels/sourcemodel.py b/src/gui/views/treemodels/sourcemodel.py
index d62926663..a0bbb7c36 100644
--- a/src/gui/views/treemodels/sourcemodel.py
+++ b/src/gui/views/treemodels/sourcemodel.py
@@ -110,6 +110,6 @@ class SourceModel(FlatBaseModel):
                                              self.db.get_source_from_handle(data[0]))
             except:
                 log.error("Failed to create tooltip.",exc_info=True)
-                return t
+            return t
         else:
             return u''