Index: /trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 9197)
+++ /trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 9198)
@@ -1151,8 +1151,12 @@
         }
         for (final GeoImageLayer i : getLayersOfType(GeoImageLayer.class)) {
-            layerInfo.add(i.getName());
+            if (i.isVisible()) {
+                layerInfo.add(i.getName());
+            }
         }
         for (final ImageryLayer i : getLayersOfType(ImageryLayer.class)) {
-            layerInfo.add(ImageryInfo.ImageryType.BING.equals(i.getInfo().getImageryType()) ? "Bing" : i.getName());
+            if (i.isVisible()) {
+                layerInfo.add(ImageryInfo.ImageryType.BING.equals(i.getInfo().getImageryType()) ? "Bing" : i.getName());
+            }
         }
         return Utils.join("; ", layerInfo);
Index: /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 9197)
+++ /trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java	(revision 9198)
@@ -32,4 +32,5 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -73,5 +74,6 @@
             public void hyperlinkUpdate(HyperlinkEvent e) {
                 if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) {
-                    hcbUploadSource.setText(Main.map.mapView.getLayerInformationForSourceTag());
+                    final String source = Main.map.mapView.getLayerInformationForSourceTag();
+                    hcbUploadSource.setText(Utils.shortenString(source, Changeset.MAX_CHANGESET_TAG_LENGTH));
                     // Fix #9965
                     changesetSourceModel.setComment(hcbUploadSource.getText());