Index: trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java	(revision 18173)
+++ trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java	(revision 18174)
@@ -85,5 +85,5 @@
      */
     private void saveHistory() {
-        hcbSearchString.getModel().addTopElement(SearchSetting.fromString(hcbSearchString.getText()));
+        model.addTopElement(SearchSetting.fromString(hcbSearchString.getText()));
         prefs.save(OVERPASS_WIZARD_HISTORY);
     }
@@ -120,7 +120,5 @@
      */
     private boolean buildQueryAction() {
-        final String wizardSearchTerm = getSearchSettings().text;
-
-        Optional<String> q = this.tryParseSearchTerm(wizardSearchTerm);
+        Optional<String> q = tryParseSearchTerm(getSearchSettings().text);
         q.ifPresent(callbacks::submitWizardResult);
         return q.isPresent();
Index: trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 18173)
+++ trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 18174)
@@ -320,8 +320,7 @@
     private void updateHistory(JTextField text) {
         String tag = (String) text.getDocument().getProperty("tag"); // tag is either "comment" or "source"
-        if (tag.equals("comment")) {
+        if ("comment".equals(tag)) {
             hcbUploadComment.addCurrentItemToHistory();
-        }
-        if (tag.equals("source")) {
+        } else if ("source".equals(tag)) {
             hcbUploadSource.addCurrentItemToHistory();
         }
@@ -382,5 +381,5 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        getDialog().setFocusToUploadButton();
+        setFocusToUploadButton();
     }
 
@@ -439,5 +438,5 @@
     public void keyTyped(KeyEvent e) {
         if (e.getKeyChar() == KeyEvent.VK_ENTER) {
-            getDialog().setFocusToUploadButton();
+            setFocusToUploadButton();
         }
     }
@@ -450,3 +449,7 @@
     public void keyReleased(KeyEvent e) {
     }
+
+    private void setFocusToUploadButton() {
+        Optional.ofNullable(getDialog()).ifPresent(UploadDialog::setFocusToUploadButton);
+    }
 }
Index: trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java	(revision 18173)
+++ trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java	(revision 18174)
@@ -276,5 +276,5 @@
                 Changeset cs = (Changeset) cbOpenChangesets.getSelectedItem();
                 if (cs == null) return;
-                uploadDialogModel.putAll(getSelectedChangeset().getKeys());
+                uploadDialogModel.putAll(cs.getKeys());
                 firePropertyChange(SELECTED_CHANGESET_PROP, null, cs);
             }