Index: /trunk/src/org/openstreetmap/josm/actions/DrawBoundariesOfDownloadedDataAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/DrawBoundariesOfDownloadedDataAction.java	(revision 18681)
+++ /trunk/src/org/openstreetmap/josm/actions/DrawBoundariesOfDownloadedDataAction.java	(revision 18682)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -26,4 +27,5 @@
                 DrawingPreference.SOURCE_BOUNDS_PROP
         );
+        setHelpId(ht("/MapView#Downloadedarea"));
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java	(revision 18681)
+++ /trunk/src/org/openstreetmap/josm/actions/ExpertToggleAction.java	(revision 18682)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -114,7 +115,7 @@
               tr("Enable/disable expert mode"),
               null,
-              false /* register toolbar */, null, false
+              false /* register toolbar */, "expertmode", false
         );
-        setToolbarId("expertmode");
+        setHelpId(ht("/ExpertMode"));
         if (MainApplication.getToolbar() != null) {
             MainApplication.getToolbar().register(this);
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java	(revision 18681)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java	(revision 18682)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.gui.tagging.presets;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -35,7 +36,6 @@
             super(tr("Search for objects by preset..."), "dialogs/search", tr("Search for objects by their presets."),
                     Shortcut.registerShortcut("preset:search-objects", tr("Presets: {0}", tr("Search for objects by preset...")),
-                    KeyEvent.VK_F3, Shortcut.SHIFT), false);
-            putValue("toolbar", "presets/search-objects");
-            MainApplication.getToolbar().register(this);
+                    KeyEvent.VK_F3, Shortcut.SHIFT), true, "presets/search-objects", true);
+            setHelpId(ht("/Action/TaggingPresetSearchPrimitive"));
         }