Index: trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java	(revision 12577)
+++ trunk/src/org/openstreetmap/josm/actions/OverpassDownloadAction.java	(revision 12578)
@@ -228,9 +228,9 @@
                     overpassQueryList.setVisible(false);
                     arrowButton.setDirection(BasicArrowButton.WEST);
-                    OVERPASS_QUERY_LIST_OPENED.put(false);
+                    OVERPASS_QUERY_LIST_OPENED.put(Boolean.FALSE);
                 } else {
                     overpassQueryList.setVisible(true);
                     arrowButton.setDirection(BasicArrowButton.EAST);
-                    OVERPASS_QUERY_LIST_OPENED.put(false);
+                    OVERPASS_QUERY_LIST_OPENED.put(Boolean.FALSE);
                 }
             });
Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 12577)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 12578)
@@ -1003,4 +1003,8 @@
     public static class SearchSettingsActionParameter extends ActionParameter<SearchSetting> {
 
+        /**
+         * Constructs a new {@code SearchSettingsActionParameter}.
+         * @param name parameter name (the key)
+         */
         public SearchSettingsActionParameter(String name) {
             super(name);
Index: trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryList.java	(revision 12577)
+++ trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryList.java	(revision 12578)
@@ -184,7 +184,6 @@
                 componentParent,
                 tr("Edit item"),
-                item.getKey(),
-                item.getQuery(),
-                new String[] {tr("Save")});
+                item,
+                tr("Save"));
         dialog.showDialog();
 
@@ -428,5 +427,5 @@
 
         EditItemDialog(Component parent, String title, String... buttonTexts) {
-            this(parent, title, "", "", buttonTexts);
+            this(parent, title, null, buttonTexts);
         }
 
@@ -434,9 +433,10 @@
                 Component parent,
                 String title,
-                String nameToEdit,
-                String queryToEdit,
+                SelectorItem itemToEdit,
                 String... buttonTexts) {
             super(parent, title, buttonTexts);
 
+            String nameToEdit = itemToEdit != null ? itemToEdit.getKey() : "";
+            String queryToEdit = itemToEdit != null ? itemToEdit.getQuery() : "";
             this.initialNameHash = nameToEdit.hashCode();