Index: /applications/editors/josm/plugins/tageditor/build.xml
===================================================================
--- /applications/editors/josm/plugins/tageditor/build.xml	(revision 32507)
+++ /applications/editors/josm/plugins/tageditor/build.xml	(revision 32508)
@@ -2,5 +2,5 @@
 <project name="tageditor" default="dist" basedir=".">
     <property name="commit.message" value="Tageditor:  help shortcut parser, rebuild"/>
-    <property name="plugin.main.version" value="8863"/>
+    <property name="plugin.main.version" value="10279"/>
     
 	<property name="plugin.author" value="Karl Guggisberg"/>
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java	(revision 32507)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java	(revision 32508)
@@ -278,5 +278,5 @@
         tagEditor.getModel().clearAppliedPresets();
         tagEditor.getModel().initFromJOSMSelection();
-        autocomplete = Main.main.getEditLayer().data.getAutoCompletionManager();
+        autocomplete = Main.getLayerManager().getEditLayer().data.getAutoCompletionManager();
         tagEditor.setAutoCompletionManager(autocomplete);
         getModel().ensureOneTag();
@@ -313,5 +313,5 @@
             setVisible(false);
             tagEditor.getModel().updateJOSMSelection();
-            DataSet ds = Main.main.getCurrentDataSet();
+            DataSet ds = Main.getLayerManager().getEditDataSet();
             ds.fireSelectionChanged();
             Main.parent.repaint(); // repaint all - drawing could have been changed
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionContext.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionContext.java	(revision 32507)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionContext.java	(revision 32508)
@@ -3,4 +3,5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 
 public class AutoCompletionContext {
@@ -15,8 +16,9 @@
 
     public void initFromJOSMSelection() {
-        selectionIncludesNodes = ! Main.main.getCurrentDataSet().getSelectedNodes().isEmpty();
-        selectionIncludesWays = !Main.main.getCurrentDataSet().getSelectedWays().isEmpty();
-        selectionIncludesRelations = !Main.main.getCurrentDataSet().getSelectedRelations().isEmpty();
-        selectionEmpty = (Main.main.getCurrentDataSet().getSelected().size() == 0);
+        DataSet ds = Main.getLayerManager().getEditDataSet();
+        selectionIncludesNodes = !ds.getSelectedNodes().isEmpty();
+        selectionIncludesWays = !ds.getSelectedWays().isEmpty();
+        selectionIncludesRelations = !ds.getSelectedRelations().isEmpty();
+        selectionEmpty = ds.getSelected().isEmpty();
     }
 
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java	(revision 32507)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java	(revision 32508)
@@ -148,5 +148,5 @@
     public void updateJOSMSelection() {
         ArrayList<Command> commands = new ArrayList<>();
-        Collection<OsmPrimitive> selection = Main.main.getCurrentDataSet().getSelected();
+        Collection<OsmPrimitive> selection = Main.getLayerManager().getEditDataSet().getSelected();
         if (selection == null)
             return;
@@ -175,5 +175,5 @@
      */
     public void initFromJOSMSelection() {
-        Collection<OsmPrimitive> selection = Main.main.getCurrentDataSet().getSelected();
+        Collection<OsmPrimitive> selection = Main.getLayerManager().getEditDataSet().getSelected();
         clear();
         for (OsmPrimitive element : selection) {