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 30211)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java	(revision 30303)
@@ -145,5 +145,5 @@
         			JMenuItem handlerItem = null;
         			if (dataURL != null) {
-        			    handlerItem = endMenu.add(new DownloadDataAction(module.getDisplayedName()+"_"+handlerName, dataURL));
+        			    handlerItem = endMenu.add(new DownloadDataAction(module, handlerName, dataURL));
         			} else if (dataURLs != null) {
         				JMenu handlerMenu = new JMenu(handlerName);
@@ -151,5 +151,5 @@
         				for (Pair<String, URL> pair : dataURLs) {
         					if (pair != null && pair.a != null && pair.b != null) {
-        						item = handlerMenu.add(new DownloadDataAction(pair.a, pair.b));
+        						item = handlerMenu.add(new DownloadDataAction(module, pair.a, pair.b));
         					}
         				}
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataAction.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataAction.java	(revision 30211)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataAction.java	(revision 30303)
@@ -23,4 +23,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.opendata.core.modules.Module;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -29,10 +30,10 @@
 	private final URL url;
 	
-	public DownloadDataAction(String name, URL url) {
+	public DownloadDataAction(Module module, String name, URL url) {
 		super(false);
 		CheckParameterUtil.ensureParameterNotNull(name, "name");
 		CheckParameterUtil.ensureParameterNotNull(url, "url");
 		putValue(Action.NAME, name);
-		putValue("toolbar", "opendata_download_"+name.toLowerCase().replace(" ", "_"));
+		putValue("toolbar", ("opendata_download_"+module.getDisplayedName()+"_"+name).toLowerCase().replace(" ", "_"));
 		this.url = url;
 	}
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipImporter.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipImporter.java	(revision 30211)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipImporter.java	(revision 30303)
@@ -16,4 +16,5 @@
 package org.openstreetmap.josm.plugins.opendata.core.io.archive;
 
+import java.io.File;
 import java.io.InputStream;
 
@@ -38,3 +39,8 @@
 		}
 	}
+
+    @Override
+    public boolean acceptFile(File pathname) {
+        return super.acceptFile(pathname) && !pathname.getName().endsWith(".osm.zip");
+    }
 }