Index: /applications/editors/josm/plugins/indoorhelper/build.xml
===================================================================
--- /applications/editors/josm/plugins/indoorhelper/build.xml	(revision 32467)
+++ /applications/editors/josm/plugins/indoorhelper/build.xml	(revision 32468)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Inital commit"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="9759"/>
+    <property name="plugin.main.version" value="10279"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java
===================================================================
--- /applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java	(revision 32467)
+++ /applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java	(revision 32468)
@@ -23,5 +23,4 @@
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,11 +30,10 @@
 
 import javax.swing.JOptionPane;
-import javax.xml.stream.XMLStreamException;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ValidateAction;
+import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.preferences.MapListSetting;
 import org.openstreetmap.josm.data.preferences.Setting;
-import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
@@ -43,5 +41,4 @@
 import org.openstreetmap.josm.gui.dialogs.FilterTableModel;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.xml.sax.SAXException;
 
 import model.IndoorHelperModel;
@@ -59,5 +56,4 @@
  *
  */
-
 public class IndoorHelperController {
 
Index: /applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java
===================================================================
--- /applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java	(revision 32467)
+++ /applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java	(revision 32468)
@@ -39,5 +39,4 @@
  * @author egru
  */
-
 public class IndoorHelperModel{
 
@@ -261,5 +260,5 @@
 	 */
 	public void addTagsToOSM(IndoorObject object, List<Tag> userTags){
-		if(!Main.main.getCurrentDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()){
+		if(!Main.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()){
 			
 			List<Tag> tags = this.getObjectTags(object);
@@ -279,10 +278,8 @@
 			}
 			
-		} else if(Main.main.getCurrentDataSet().selectionEmpty()){
+		} else if(Main.getLayerManager().getEditDataSet().selectionEmpty()){
 			
 			JOptionPane.showMessageDialog(null, "No data selected.", "Error", JOptionPane.ERROR_MESSAGE);
-			
-		}
-		
+		}
 	}
 	
@@ -295,5 +292,5 @@
 	public void addTagsToOSM(IndoorObject object){
 		
-		if(!Main.main.getCurrentDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()){
+		if(!Main.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()){
 			List<Tag> tags = this.getObjectTags(object);
 			tags.add(new Tag("indoor:level", Integer.toString(workingLevel)));
@@ -306,9 +303,7 @@
 				Main.main.undoRedo.add(new ChangePropertyCommand(Main.main.getInProgressSelection(), t.getKey(), t.getValue()));
 			}
-		} else if(Main.main.getCurrentDataSet().selectionEmpty()){
+		} else if(Main.getLayerManager().getEditDataSet().selectionEmpty()){
 			JOptionPane.showMessageDialog(null, "No data selected.", "Error", JOptionPane.ERROR_MESSAGE);
 		}
-		
-		
 	}
 	
@@ -321,6 +316,3 @@
 		return counter.getRanking();
 	}
-	
-	
-
 }