Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java	(revision 30197)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java	(revision 30211)
@@ -121,5 +121,7 @@
         	JMenu moduleMenu = null;
         	for (AbstractDataSetHandler handler: module.getNewlyInstanciatedHandlers()) {
-        		if (handler.getDataURL() != null || (handler.getDataURLs() != null && !handler.getDataURLs().isEmpty())) {
+        	    URL dataURL = handler.getDataURL();
+        	    List<Pair<String, URL>> dataURLs = handler.getDataURLs();
+        		if (dataURL != null || (dataURLs != null && !dataURLs.isEmpty())) {
         			if (moduleMenu == null) {
         				moduleMenu = getModuleMenu(module);
@@ -142,10 +144,10 @@
         			}
         			JMenuItem handlerItem = null;
-        			if (handler.getDataURL() != null) {
-        			    handlerItem = endMenu.add(new DownloadDataAction(handlerName, handler.getDataURL()));
-        			} else if (handler.getDataURLs() != null) {
+        			if (dataURL != null) {
+        			    handlerItem = endMenu.add(new DownloadDataAction(module.getDisplayedName()+"_"+handlerName, dataURL));
+        			} else if (dataURLs != null) {
         				JMenu handlerMenu = new JMenu(handlerName);
         				JMenuItem item = null;
-        				for (Pair<String, URL> pair : handler.getDataURLs()) {
+        				for (Pair<String, URL> pair : dataURLs) {
         					if (pair != null && pair.a != null && pair.b != null) {
         						item = handlerMenu.add(new DownloadDataAction(pair.a, pair.b));
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java	(revision 30197)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java	(revision 30211)
@@ -427,9 +427,11 @@
 	
 	public boolean acceptsUrl(String url) {
-		if (getDataURL() != null && url.equals(getDataURL().toString())) {
+	    URL dataURL = getDataURL();
+		if (dataURL != null && url.equals(dataURL.toString())) {
 			return true;
 		}
-		if (getDataURLs() != null) {
-			for (Pair<String, URL> pair : getDataURLs()) {
+		List<Pair<String, URL>> dataURLs = getDataURLs();
+		if (dataURLs != null) {
+			for (Pair<String, URL> pair : dataURLs) {
 				if (pair.b != null && url.equals(pair.b.toString())) {
 					return true;