diff --git a/src/Bookmarks.py b/src/Bookmarks.py
index 5584c1010..1d5b9e9cf 100644
--- a/src/Bookmarks.py
+++ b/src/Bookmarks.py
@@ -306,8 +306,7 @@ class Bookmarks :
 
     def help_clicked(self):
         """Display the relevant portion of GRAMPS manual."""
-        GrampsDisplay.help('gramps-nav', webpage=WIKI_HELP_PAGE, 
-                                   section=WIKI_HELP_SEC)
+        GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC)
 
 class ListBookmarks(Bookmarks):
 
diff --git a/src/DataViews/GrampletView.py b/src/DataViews/GrampletView.py
index 2e855f1e6..424470eda 100644
--- a/src/DataViews/GrampletView.py
+++ b/src/DataViews/GrampletView.py
@@ -178,7 +178,7 @@ class GrampletWindow(ManagedWindow.ManagedWindow):
             self.close()
         elif response == gtk.RESPONSE_HELP:
             # translated name:
-            GrampsDisplay.help('gramplet', WIKI_HELP_PAGE, 
+            GrampsDisplay.help(WIKI_HELP_PAGE, 
                                self.gramplet.tname.replace(" ", "_"))
         
     def build_menu_names(self, obj):
@@ -461,8 +461,7 @@ class Gramplet(object):
                     return True
                 elif link_type == 'WIKI':
                     if event.button == 1: # left mouse
-                        GrampsDisplay.help('gramplet', 
-                                           handle.replace(" ", "_"))
+                        GrampsDisplay.help(handle.replace(" ", "_"))
                     return True
                 elif link_type == 'PersonList':
                     if event.button == 1: # left mouse
diff --git a/src/DateEdit.py b/src/DateEdit.py
index e266909f0..d05bd861d 100644
--- a/src/DateEdit.py
+++ b/src/DateEdit.py
@@ -263,7 +263,7 @@ class DateEditorDialog(ManagedWindow.ManagedWindow):
         while True:
             response = self.window.run()
             if response == gtk.RESPONSE_HELP:
-                GrampsDisplay.help('adv-dates', webpage=WIKI_HELP_PAGE, 
+                GrampsDisplay.help(webpage=WIKI_HELP_PAGE,
                                    section=WIKI_HELP_SEC)
             elif response == gtk.RESPONSE_DELETE_EVENT:
                 break
diff --git a/src/Editors/AddMedia.py b/src/Editors/AddMedia.py
index 711dc04a0..13789b938 100644
--- a/src/Editors/AddMedia.py
+++ b/src/Editors/AddMedia.py
@@ -133,8 +133,7 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
         self.cancel_button = self.glade.get_widget('button81')
         self.ok_button.connect('clicked',self.save)
         self.ok_button.set_sensitive(not self.dbase.readonly)
-        self.help_button.connect('clicked', lambda x: GrampsDisplay.help(
-                                                        'gramps-edit-quick'))
+        self.help_button.connect('clicked', lambda x: GrampsDisplay.help())
         self.cancel_button.connect('clicked', self.close)
         self.show()
         self.modal_call()
diff --git a/src/Editors/_EditAddress.py b/src/Editors/_EditAddress.py
index a00376ac5..d2c606370 100644
--- a/src/Editors/_EditAddress.py
+++ b/src/Editors/_EditAddress.py
@@ -118,7 +118,7 @@ class EditAddress(EditSecondary):
                                   self.obj, self.db.readonly)
 
     def _connect_signals(self):
-        self.define_help_button(self.top.get_widget('help'),'adv-ad')
+        self.define_help_button(self.top.get_widget('help'))
         self.define_cancel_button(self.top.get_widget('cancel'))
         self.define_ok_button(self.top.get_widget('ok'),self.save)
 
diff --git a/src/Editors/_EditAttribute.py b/src/Editors/_EditAttribute.py
index 1f98977d2..32efee040 100644
--- a/src/Editors/_EditAttribute.py
+++ b/src/Editors/_EditAttribute.py
@@ -86,7 +86,7 @@ class EditAttribute(EditSecondary):
 
     def _connect_signals(self):
         self.define_cancel_button(self.top.get_widget('cancel'))
-        self.define_help_button(self.top.get_widget('help'),'adv-at')
+        self.define_help_button(self.top.get_widget('help'))
         self.define_ok_button(self.top.get_widget('ok'),self.save)
 
     def _setup_fields(self):
diff --git a/src/Editors/_EditChildRef.py b/src/Editors/_EditChildRef.py
index a3ed39eef..e8670de66 100644
--- a/src/Editors/_EditChildRef.py
+++ b/src/Editors/_EditChildRef.py
@@ -119,7 +119,7 @@ class EditChildRef(EditSecondary):
             self.db.readonly)
 
     def _connect_signals(self):
-        self.define_help_button(self.top.get_widget('help'), 'adv-ad')
+        self.define_help_button(self.top.get_widget('help'))
         self.define_cancel_button(self.top.get_widget('cancel'))
         self.define_ok_button(self.ok_button, self.save)
         self.edit_button.connect('button-press-event', self.edit_child)
diff --git a/src/Editors/_EditEvent.py b/src/Editors/_EditEvent.py
index 0c95b347b..ad7fe8449 100644
--- a/src/Editors/_EditEvent.py
+++ b/src/Editors/_EditEvent.py
@@ -195,8 +195,7 @@ class EditEvent(EditPrimary):
 
     def help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('adv-ev', webpage=WIKI_HELP_PAGE, 
-                                   section=WIKI_HELP_SEC)
+        GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC)
     def save(self, *obj):
         self.ok_button.set_sensitive(False)
         if self.object_is_empty():
diff --git a/src/Editors/_EditEventRef.py b/src/Editors/_EditEventRef.py
index a6d3885a4..fcb67f5e0 100644
--- a/src/Editors/_EditEventRef.py
+++ b/src/Editors/_EditEventRef.py
@@ -106,7 +106,7 @@ class EditEventRef(EditReference):
         self.define_ok_button(self.top.get_widget('ok'),self.ok_clicked)
         self.define_cancel_button(self.top.get_widget('cancel'))
         # FIXME: activate when help page is available
-        #self.define_help_button(self.top.get_widget('help'), 'tag')
+        #self.define_help_button(self.top.get_widget('help'))
 
     def _setup_fields(self):
         
diff --git a/src/Editors/_EditLdsOrd.py b/src/Editors/_EditLdsOrd.py
index bf43e84a8..b0ac10623 100644
--- a/src/Editors/_EditLdsOrd.py
+++ b/src/Editors/_EditLdsOrd.py
@@ -155,7 +155,7 @@ class EditLdsOrd(EditSecondary):
     def _connect_signals(self):
         self.parents_select.connect('clicked',self.select_parents_clicked)
         self.define_cancel_button(self.top.get_widget('cancel'))
-        self.define_help_button(self.top.get_widget('help'),'adv-at')
+        self.define_help_button(self.top.get_widget('help'))
         self.define_ok_button(self.top.get_widget('ok'),self.save)
 
     def _get_types(self):
@@ -340,7 +340,7 @@ class EditFamilyLdsOrd(EditSecondary):
 
     def _connect_signals(self):
         self.define_cancel_button(self.top.get_widget('cancel'))
-        self.define_help_button(self.top.get_widget('help'),'adv-at')
+        self.define_help_button(self.top.get_widget('help'))
         self.define_ok_button(self.top.get_widget('ok'),self.save)
 
     def _get_types(self):
diff --git a/src/Editors/_EditLocation.py b/src/Editors/_EditLocation.py
index e9d88ed83..37cab3125 100644
--- a/src/Editors/_EditLocation.py
+++ b/src/Editors/_EditLocation.py
@@ -110,7 +110,7 @@ class EditLocation(EditSecondary):
     def _connect_signals(self):
         self.define_cancel_button(self.top.get_widget('button119'))
         self.define_ok_button(self.top.get_widget('button118'),self.save)
-        self.define_help_button(self.top.get_widget('button128'),'gramps-edit-complete')
+        self.define_help_button(self.top.get_widget('button128'))
         
     def save(self,*obj):
         if self.callback:
diff --git a/src/Editors/_EditMedia.py b/src/Editors/_EditMedia.py
index 3fc4492c8..6833d27f3 100644
--- a/src/Editors/_EditMedia.py
+++ b/src/Editors/_EditMedia.py
@@ -100,8 +100,7 @@ class EditMedia(EditPrimary):
     def _connect_signals(self):
         self.define_cancel_button(self.glade.get_widget('button91'))
         self.define_ok_button(self.glade.get_widget('ok'), self.save)
-        self.define_help_button(self.glade.get_widget('button102'), 
-                                'adv-media')
+        self.define_help_button(self.glade.get_widget('button102'))
 
     def _setup_fields(self):
         self.date_field = MonitoredDate(self.glade.get_widget("date_entry"),
diff --git a/src/Editors/_EditName.py b/src/Editors/_EditName.py
index 4cfd30e00..ece0320e6 100644
--- a/src/Editors/_EditName.py
+++ b/src/Editors/_EditName.py
@@ -141,7 +141,7 @@ class EditName(EditSecondary):
 
     def _connect_signals(self):
         self.define_cancel_button(self.top.get_widget('button119'))
-        self.define_help_button(self.top.get_widget('button131'),'adv-an')
+        self.define_help_button(self.top.get_widget('button131'))
         self.define_ok_button(self.top.get_widget('button118'),self.save)
 
     def _setup_fields(self):
diff --git a/src/Editors/_EditNote.py b/src/Editors/_EditNote.py
index 6e7edc146..a367c0f83 100644
--- a/src/Editors/_EditNote.py
+++ b/src/Editors/_EditNote.py
@@ -223,7 +223,7 @@ class EditNote(EditPrimary):
         """
         self.define_ok_button(self.top.get_widget('ok'), self.save)
         self.define_cancel_button(self.top.get_widget('cancel'))
-        self.define_help_button(self.top.get_widget('help'), '')
+        self.define_help_button(self.top.get_widget('help'))
     
     def _create_tabbed_pages(self):
         """Create the notebook tabs and inserts them into the main window."""
diff --git a/src/Editors/_EditPerson.py b/src/Editors/_EditPerson.py
index dce036765..e9d45ee75 100644
--- a/src/Editors/_EditPerson.py
+++ b/src/Editors/_EditPerson.py
@@ -174,7 +174,7 @@ class EditPerson(EditPrimary):
         """
         self.define_cancel_button(self.top.get_widget("button15"))
         self.define_ok_button(self.top.get_widget("ok"), self.save)
-        self.define_help_button(self.top.get_widget("button134"), 'adv-pers')
+        self.define_help_button(self.top.get_widget("button134"))
 
         self.given.connect("focus_out_event", self._given_focus_out_event)
         self.top.get_widget("button177").connect("clicked",
diff --git a/src/Editors/_EditPersonRef.py b/src/Editors/_EditPersonRef.py
index d458f1243..e44517d5a 100644
--- a/src/Editors/_EditPersonRef.py
+++ b/src/Editors/_EditPersonRef.py
@@ -100,7 +100,7 @@ class EditPersonRef(EditSecondary):
             self.db.readonly)
 
     def _connect_signals(self):
-        #self.define_help_button(self.top.get_widget('help'),'adv-ad')
+        #self.define_help_button(self.top.get_widget('help'))
         self.define_cancel_button(self.top.get_widget('cancel'))
         self.define_ok_button(self.top.get_widget('ok'),self.save)
         self.top.get_widget('select').connect('clicked',self._select_person)
diff --git a/src/Editors/_EditPlace.py b/src/Editors/_EditPlace.py
index 8ea37a834..9fdbb347d 100644
--- a/src/Editors/_EditPlace.py
+++ b/src/Editors/_EditPlace.py
@@ -138,7 +138,7 @@ class EditPlace(EditPrimary):
     def _connect_signals(self):
         self.define_ok_button(self.top.get_widget('ok'), self.save)
         self.define_cancel_button(self.top.get_widget('cancel'))
-        self.define_help_button(self.top.get_widget('help'),'adv-plc')
+        self.define_help_button(self.top.get_widget('help'))
 
     def _setup_fields(self):
         mloc = self.obj.get_main_location()
diff --git a/src/Editors/_EditPrimary.py b/src/Editors/_EditPrimary.py
index e73fb974f..e27e5eeea 100644
--- a/src/Editors/_EditPrimary.py
+++ b/src/Editors/_EditPrimary.py
@@ -145,8 +145,8 @@ class EditPrimary(ManagedWindow.ManagedWindow):
     def define_cancel_button(self, button):
         button.connect('clicked', self.close)
 
-    def define_help_button(self, button, tag, webpage='', section=''):
-        button.connect('clicked', lambda x: GrampsDisplay.help(tag, webpage, 
+    def define_help_button(self, button, webpage='', section=''):
+        button.connect('clicked', lambda x: GrampsDisplay.help(webpage,
                                                                section))
 
     def _do_close(self, *obj):
diff --git a/src/Editors/_EditReference.py b/src/Editors/_EditReference.py
index a987548dd..c978aa90c 100644
--- a/src/Editors/_EditReference.py
+++ b/src/Editors/_EditReference.py
@@ -198,9 +198,9 @@ class EditReference(ManagedWindow.ManagedWindow):
         self._cleanup_on_exit()
         self.close(obj)
 
-    def define_help_button(self, button, tag, webpage='', section=''):
+    def define_help_button(self, button, webpage='', section=''):
         import GrampsDisplay
-        button.connect('clicked', lambda x: GrampsDisplay.help(tag, webpage,
+        button.connect('clicked', lambda x: GrampsDisplay.help(webpage,
                                                                section))
         button.set_sensitive(True)
 
diff --git a/src/Editors/_EditRepository.py b/src/Editors/_EditRepository.py
index 8b32d9dd1..5366d3e54 100644
--- a/src/Editors/_EditRepository.py
+++ b/src/Editors/_EditRepository.py
@@ -134,7 +134,7 @@ class EditRepository(EditPrimary):
         self.glade.get_widget("vbox").pack_start(notebook, True, True)
 
     def _connect_signals(self):
-        self.define_help_button(self.glade.get_widget('help'),'adv-src')
+        self.define_help_button(self.glade.get_widget('help'))
         self.define_cancel_button(self.glade.get_widget('cancel'))
         self.define_ok_button(self.glade.get_widget('ok'), self.save)
 
diff --git a/src/Editors/_EditSecondary.py b/src/Editors/_EditSecondary.py
index 6ef9d8049..c3305bf97 100644
--- a/src/Editors/_EditSecondary.py
+++ b/src/Editors/_EditSecondary.py
@@ -124,8 +124,8 @@ class EditSecondary(ManagedWindow.ManagedWindow):
     def define_cancel_button(self,button):
         button.connect('clicked',self.close)
 
-    def define_help_button(self, button, tag, webpage='', section=''):
-        button.connect('clicked', lambda x: GrampsDisplay.help(tag, webpage,
+    def define_help_button(self, button, webpage='', section=''):
+        button.connect('clicked', lambda x: GrampsDisplay.help(webpage,
                                                                section))
 
     def close(self,*obj):
diff --git a/src/Editors/_EditSource.py b/src/Editors/_EditSource.py
index b5b5ebbad..f07151fff 100644
--- a/src/Editors/_EditSource.py
+++ b/src/Editors/_EditSource.py
@@ -91,7 +91,7 @@ class EditSource(EditPrimary):
     def _connect_signals(self):
         self.define_ok_button(self.glade.get_widget('ok'),self.save)
         self.define_cancel_button(self.glade.get_widget('cancel'))
-        self.define_help_button(self.glade.get_widget('help'),'adv-src')
+        self.define_help_button(self.glade.get_widget('help'))
 
     def _setup_fields(self):
         self.author = MonitoredEntry(self.glade.get_widget("author"),
diff --git a/src/Editors/_EditSourceRef.py b/src/Editors/_EditSourceRef.py
index 23bbae6c3..34bf57085 100644
--- a/src/Editors/_EditSourceRef.py
+++ b/src/Editors/_EditSourceRef.py
@@ -86,7 +86,7 @@ class EditSourceRef(EditReference):
     def _connect_signals(self):
         self.define_ok_button(self.top.get_widget('ok'),self.ok_clicked)
         self.define_cancel_button(self.top.get_widget('cancel'))
-        self.define_help_button(self.top.get_widget("help"), 'adv-si')
+        self.define_help_button(self.top.get_widget("help"))
 
     def _setup_fields(self):
         self.ref_privacy = PrivacyButton(
diff --git a/src/Editors/_EditUrl.py b/src/Editors/_EditUrl.py
index 9ebaef53e..6b5dcfe9e 100644
--- a/src/Editors/_EditUrl.py
+++ b/src/Editors/_EditUrl.py
@@ -71,7 +71,7 @@ class EditUrl(EditSecondary):
         self.jump.connect('clicked', self.jump_to)
         self.define_cancel_button(self.top.get_widget('button125'))
         self.define_ok_button(self.top.get_widget('button124'), self.save)
-        self.define_help_button(self.top.get_widget('button130'), 'gramps-edit_complete')
+        self.define_help_button(self.top.get_widget('button130'))
         
     def jump_to(self, obj):
         if self.obj.get_path():
diff --git a/src/FilterEditor/_EditFilter.py b/src/FilterEditor/_EditFilter.py
index b3742ca61..5d11a82d1 100644
--- a/src/FilterEditor/_EditFilter.py
+++ b/src/FilterEditor/_EditFilter.py
@@ -118,7 +118,7 @@ class EditFilter(ManagedWindow.ManagedWindow):
 
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-util-cfe')
+        GrampsDisplay.help()
 
     def close_window(self, obj):
         self.close()
diff --git a/src/FilterEditor/_EditRule.py b/src/FilterEditor/_EditRule.py
index bf04854e4..6bad90769 100644
--- a/src/FilterEditor/_EditRule.py
+++ b/src/FilterEditor/_EditRule.py
@@ -579,7 +579,7 @@ class EditRule(ManagedWindow.ManagedWindow):
         """
         Display the relevant portion of GRAMPS manual.
         """
-        GrampsDisplay.help('append-filtref')
+        GrampsDisplay.help()
 
     def close_window(self, obj):
         self.close()
diff --git a/src/FilterEditor/_FilterEditor.py b/src/FilterEditor/_FilterEditor.py
index 32ff43819..0ba9962db 100644
--- a/src/FilterEditor/_FilterEditor.py
+++ b/src/FilterEditor/_FilterEditor.py
@@ -122,7 +122,7 @@ class FilterEditor(ManagedWindow.ManagedWindow):
         
     def help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-util-cfe')
+        GrampsDisplay.help()
 
     def filter_select_row(self, obj):
         store, node = self.clist.get_selected()
diff --git a/src/GrampsDisplay.py b/src/GrampsDisplay.py
index fc910b447..c2964c636 100644
--- a/src/GrampsDisplay.py
+++ b/src/GrampsDisplay.py
@@ -55,19 +55,10 @@ try:
 except KeyError:
     pass
 
-def help(target, webpage='', section=''):
+def help(webpage='', section=''):
     """
-    Display the specified target in a help window. If this fails,
-    open the manual on the web site.
+    Display the specified webpage and section from the Gramps 3.0 wiki.
     """
-    #try:
-    #    import gnome
-    #    gnome.help_display('gramps',target)
-    #except:
-    #    url(const.URL_MANUAL+'en/')
-    
-    # 3.0 Beta, direct to the wiki 3.0 Manual
-
     if not webpage:
         link = const.URL_WIKISTRING + const.URL_MANUAL_PAGE + EXTENSION
     else:
diff --git a/src/GrampsLogger/_ErrorView.py b/src/GrampsLogger/_ErrorView.py
index 4f3a13aac..ab92f9fb5 100644
--- a/src/GrampsLogger/_ErrorView.py
+++ b/src/GrampsLogger/_ErrorView.py
@@ -52,7 +52,7 @@ class ErrorView(object):
     def help_clicked(self):
         """Display the relevant portion of GRAMPS manual"""
         
-        GrampsDisplay.help('faq', WIKI_HELP_PAGE, WIKI_HELP_SEC)
+        GrampsDisplay.help(WIKI_HELP_PAGE, WIKI_HELP_SEC)
 
     def draw_window(self):
         title = "%s - GRAMPS" % _("Error Report")
diff --git a/src/Merge/_MergePerson.py b/src/Merge/_MergePerson.py
index cc212e4da..0ceb9e244 100644
--- a/src/Merge/_MergePerson.py
+++ b/src/Merge/_MergePerson.py
@@ -89,7 +89,7 @@ class PersonCompare(ManagedWindow.ManagedWindow):
 
     def help(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('adv-merge-people', webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
+        GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
 
     def merge(self, obj):
         if check_for_spouse(self.p1, self.p2):
@@ -333,7 +333,7 @@ class MergePeopleUI(ManagedWindow.ManagedWindow):
 
     def help(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('adv-merge-people', webpage=WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
+        GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
 
 
 def name_of(p):
diff --git a/src/Merge/_MergePlace.py b/src/Merge/_MergePlace.py
index 0e53a49cc..d3ab4ce77 100644
--- a/src/Merge/_MergePlace.py
+++ b/src/Merge/_MergePlace.py
@@ -98,7 +98,7 @@ class MergePlaces(ManagedWindow.ManagedWindow):
 
     def help(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('adv-merge-places', webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
+        GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
 
     def merge(self, obj):
         """
diff --git a/src/Merge/_MergeSource.py b/src/Merge/_MergeSource.py
index 41a499b94..eb8cd0aea 100644
--- a/src/Merge/_MergeSource.py
+++ b/src/Merge/_MergeSource.py
@@ -112,7 +112,7 @@ class MergeSources(ManagedWindow.ManagedWindow):
 
     def help(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('adv-merge-sources', webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
+        GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
 
     def merge(self, obj):
         """
diff --git a/src/ReportBase/_BareReportDialog.py b/src/ReportBase/_BareReportDialog.py
index b4b9d700f..47b31e686 100644
--- a/src/ReportBase/_BareReportDialog.py
+++ b/src/ReportBase/_BareReportDialog.py
@@ -454,9 +454,7 @@ class BareReportDialog(ManagedWindow.ManagedWindow):
 
     def on_help_clicked(self, *obj):
         import GrampsDisplay
-        GrampsDisplay.help(None, 
-                           URL_REPORT_PAGE, 
-                           self.report_name.replace(" ", "_") )
+        GrampsDisplay.help(URL_REPORT_PAGE, self.report_name.replace(" ", "_"))
 
     def on_ok_clicked(self, obj):
         """The user is satisfied with the dialog choices. Parse all options
diff --git a/src/ScratchPad.py b/src/ScratchPad.py
index 6cd59feed..48c41f113 100644
--- a/src/ScratchPad.py
+++ b/src/ScratchPad.py
@@ -1245,7 +1245,7 @@ class ScratchPadWindow(ManagedWindow.ManagedWindow):
         
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-util-scratch-pad')
+        GrampsDisplay.help()
 
     def on_clear_clicked(self, obj):
         """Deletes the selected object from the object list"""
diff --git a/src/ViewManager.py b/src/ViewManager.py
index bcbea3996..1fbc0b135 100644
--- a/src/ViewManager.py
+++ b/src/ViewManager.py
@@ -1459,13 +1459,13 @@ def key_bindings(obj):
     """
     Display key bindings
     """
-    GrampsDisplay.help('keybind-lists', const.WIKI_KEYBINDINGS)
+    GrampsDisplay.help(const.WIKI_KEYBINDINGS)
 
 def manual_activate(obj):
     """
     Display the GRAMPS manual
     """
-    GrampsDisplay.help('index')
+    GrampsDisplay.help()
 
 def report_bug_activate(obj):
     """
@@ -1495,7 +1495,7 @@ def faq_activate(obj):
     """
     Display FAQ
     """
-    GrampsDisplay.help("faq", webpage=const.WIKI_FAQ)
+    GrampsDisplay.help(webpage=const.WIKI_FAQ)
 
 def by_menu_name(first, second):
     """
diff --git a/src/plugins/ChangeNames.py b/src/plugins/ChangeNames.py
index 24b3bd9d8..6e1b909c7 100644
--- a/src/plugins/ChangeNames.py
+++ b/src/plugins/ChangeNames.py
@@ -231,7 +231,7 @@ class ChangeNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
 
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-db', WIKI_HELP_PAGE , WIKI_HELP_SEC)
+        GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC)
 
     def on_ok_clicked(self, obj):
         self.trans = self.db.transaction_begin("",batch=True)
diff --git a/src/plugins/Desbrowser.py b/src/plugins/Desbrowser.py
index 4543ec9f5..77099aa2f 100644
--- a/src/plugins/Desbrowser.py
+++ b/src/plugins/Desbrowser.py
@@ -109,8 +109,7 @@ class DesBrowse(Tool.ActivePersonTool, ManagedWindow.ManagedWindow):
 
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-ae',webpage=WIKI_HELP_PAGE, 
-                                   section=WIKI_HELP_SEC)
+        GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC)
 
     def add_to_tree(self, parent_id, sib_id, person_handle):
         item_id = self.model.insert_after(parent_id, sib_id)
diff --git a/src/plugins/EventCmp.py b/src/plugins/EventCmp.py
index 6e77d8ba9..07dd400f3 100644
--- a/src/plugins/EventCmp.py
+++ b/src/plugins/EventCmp.py
@@ -148,7 +148,7 @@ class EventComparison(Tool.Tool,ManagedWindow.ManagedWindow):
 
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        help('tools-util')
+        help()
 
     def build_menu_names(self, obj):
         return (_("Filter selection"),_("Event Comparison tool"))
@@ -247,7 +247,7 @@ class DisplayChart(ManagedWindow.ManagedWindow):
 
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        help('tools-ae')
+        help()
 
     def build_menu_names(self, obj):
         return (_("Event Comparison Results"),None)
diff --git a/src/plugins/ExtractCity.py b/src/plugins/ExtractCity.py
index a4b6758c9..07bab165c 100644
--- a/src/plugins/ExtractCity.py
+++ b/src/plugins/ExtractCity.py
@@ -576,7 +576,7 @@ class ExtractCity(Tool.BatchTool, ManagedWindow.ManagedWindow):
 
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-db')
+        GrampsDisplay.help()
 
     def on_ok_clicked(self, obj):
         self.trans = self.db.transaction_begin("", batch=True)
diff --git a/src/plugins/FindDupes.py b/src/plugins/FindDupes.py
index 22e79b9f0..3e5894677 100644
--- a/src/plugins/FindDupes.py
+++ b/src/plugins/FindDupes.py
@@ -146,7 +146,7 @@ class Merge(Tool.Tool,ManagedWindow.ManagedWindow):
 
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-db')
+        GrampsDisplay.help()
 
     def ancestors_of(self,p1_id,id_list):
         if (not p1_id) or (p1_id in id_list):
@@ -583,7 +583,7 @@ class ShowMatches(ManagedWindow.ManagedWindow):
 
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-db')
+        GrampsDisplay.help()
 
     def redraw(self):
         list = []
diff --git a/src/plugins/MediaManager.py b/src/plugins/MediaManager.py
index fcb59f009..c7fbaa044 100644
--- a/src/plugins/MediaManager.py
+++ b/src/plugins/MediaManager.py
@@ -152,7 +152,7 @@ class MediaMan(Tool.Tool):
 
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-util-other')
+        GrampsDisplay.help()
 
     def build_batch_ops(self):
         self.batch_ops = []
diff --git a/src/plugins/NotRelated.py b/src/plugins/NotRelated.py
index a59b36fda..79da22001 100644
--- a/src/plugins/NotRelated.py
+++ b/src/plugins/NotRelated.py
@@ -214,7 +214,7 @@ class NotRelated(Tool.Tool, ManagedWindow.ManagedWindow) :
 #   
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-util-other', WIKI_HELP_PAGE , WIKI_HELP_SEC)    
+        GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC)    
 
 
     def applyMarkerClicked(self, button) :
diff --git a/src/plugins/OwnerEditor.py b/src/plugins/OwnerEditor.py
index a6a30f719..f645f7901 100644
--- a/src/plugins/OwnerEditor.py
+++ b/src/plugins/OwnerEditor.py
@@ -145,7 +145,7 @@ class OwnerEditor(Tool.Tool, ManagedWindow.ManagedWindow):
 
     def on_help_button_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-db')
+        GrampsDisplay.help()
 
     def on_button_press_event(self, obj, event):
         """Shows popup-menu for db <-> preferences copying"""
diff --git a/src/plugins/PatchNames.py b/src/plugins/PatchNames.py
index d4032df8f..11e0dad91 100644
--- a/src/plugins/PatchNames.py
+++ b/src/plugins/PatchNames.py
@@ -276,7 +276,7 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
 
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-db')
+        GrampsDisplay.help()
 
     def on_ok_clicked(self, obj):
         self.trans = self.db.transaction_begin("",batch=True)
diff --git a/src/plugins/SoundGen.py b/src/plugins/SoundGen.py
index 8bc53a1fb..f84bc8976 100644
--- a/src/plugins/SoundGen.py
+++ b/src/plugins/SoundGen.py
@@ -112,7 +112,7 @@ class SoundGen(Tool.Tool, ManagedWindow.ManagedWindow):
 
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-util-other', WIKI_HELP_PAGE , WIKI_HELP_SEC)
+        GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC)
 
     def build_menu_names(self, obj):
         return (self.label,None)
diff --git a/src/plugins/Verify.py b/src/plugins/Verify.py
index 16563e81f..d90caf68b 100644
--- a/src/plugins/Verify.py
+++ b/src/plugins/Verify.py
@@ -294,8 +294,7 @@ class Verify(Tool.Tool, ManagedWindow, UpdateCallback):
 
     def on_help_clicked(self, obj):
         """Display the relevant portion of GRAMPS manual"""
-        GrampsDisplay.help('tools-util-other', webpage=WIKI_HELP_PAGE, 
-                                   section=WIKI_HELP_SEC)
+        GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC)
 
     def on_apply_clicked(self, obj):
         self.options.handler.options_dict['oldage'] = self.top.get_widget(