Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/AbstractGTFSCatchJoinCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/AbstractGTFSCatchJoinCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/AbstractGTFSCatchJoinCommand.java	(revision 33817)
@@ -31,4 +31,5 @@
 
     public AbstractGTFSCatchJoinCommand(GTFSImporterAction controller, boolean isCatch) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         gtfsStopTM = controller.getGTFSStopTableModel();
         workingLines = new ArrayList<>();
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSAddCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSAddCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSAddCommand.java	(revision 33817)
@@ -24,4 +24,5 @@
 
     public GTFSAddCommand(GTFSImporterAction controller) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         gtfsStopTM = controller.getGTFSStopTableModel();
         type = controller.getDialog().getStoptype();
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSDeleteCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSDeleteCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSDeleteCommand.java	(revision 33817)
@@ -24,4 +24,5 @@
 
     public GTFSDeleteCommand(GTFSImporterAction controller) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         gtfsStopTM = controller.getGTFSStopTableModel();
         workingLines = new Vector<>();
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/SettingsStoptypeCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/SettingsStoptypeCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/SettingsStoptypeCommand.java	(revision 33817)
@@ -12,4 +12,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
 import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
@@ -40,4 +41,5 @@
 
     public SettingsStoptypeCommand(StopImporterAction controller) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         waypointTM = controller.getWaypointTableModel();
         tracksListModel = controller.getTracksListModel();
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistAddCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistAddCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistAddCommand.java	(revision 33817)
@@ -8,4 +8,5 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
 import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
@@ -17,4 +18,5 @@
 
     public TrackStoplistAddCommand(StopImporterAction controller) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         stoplistTM = controller.getCurrentTrack().stoplistTM;
         workingLine = controller.getDialog().getStoplistTable().getSelectedRow();
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDeleteCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDeleteCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDeleteCommand.java	(revision 33817)
@@ -40,4 +40,5 @@
 
     public TrackStoplistDeleteCommand(StopImporterAction controller) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         stoplistTM = controller.getCurrentTrack().stoplistTM;
         workingLines = new Vector<>();
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDetachCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDetachCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDetachCommand.java	(revision 33817)
@@ -10,4 +10,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
 import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
@@ -21,4 +22,5 @@
 
     public TrackStoplistDetachCommand(StopImporterAction controller) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         stoplistTM = controller.getCurrentTrack().stoplistTM;
         workingLines = new Vector<>();
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistNameCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistNameCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistNameCommand.java	(revision 33817)
@@ -10,4 +10,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.public_transport.TransText;
 import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
@@ -34,4 +35,5 @@
 
     public TrackStoplistNameCommand(TrackReference trackref, int workingLine) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         this.trackref = trackref;
         this.workingLine = workingLine;
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistRelocateCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistRelocateCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistRelocateCommand.java	(revision 33817)
@@ -9,4 +9,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
 import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
@@ -27,4 +28,5 @@
 
     public TrackStoplistRelocateCommand(StopImporterAction controller) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         this.controller = controller;
         this.currentTrack = controller.getCurrentTrack();
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistSortCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistSortCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistSortCommand.java	(revision 33817)
@@ -12,4 +12,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.public_transport.TransText;
 import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
@@ -33,4 +34,5 @@
 
     public TrackStoplistSortCommand(StopImporterAction controller) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         stoplistTM = controller.getCurrentTrack().stoplistTM;
         workingLines = new Vector<>();
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java	(revision 33817)
@@ -44,4 +44,5 @@
 
     public TrackSuggestStopsCommand(StopImporterAction controller) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         if (controller.getCurrentTrack() == null)
             return;
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDetachCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDetachCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDetachCommand.java	(revision 33817)
@@ -10,4 +10,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
 import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
@@ -21,4 +22,5 @@
 
     public WaypointsDetachCommand(StopImporterAction controller) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         waypointTM = controller.getWaypointTableModel();
         workingLines = new Vector<>();
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDisableCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDisableCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDisableCommand.java	(revision 33817)
@@ -22,4 +22,5 @@
 
     public WaypointsDisableCommand(StopImporterAction controller) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         waypointTM = controller.getWaypointTableModel();
         workingLines = new Vector<>();
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsEnableCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsEnableCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsEnableCommand.java	(revision 33817)
@@ -23,4 +23,5 @@
 
     public WaypointsEnableCommand(StopImporterAction controller) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         waypointTM = controller.getWaypointTableModel();
         type = controller.getDialog().getStoptype();
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsNameCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsNameCommand.java	(revision 33816)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsNameCommand.java	(revision 33817)
@@ -8,4 +8,5 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.public_transport.TransText;
 import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
@@ -26,4 +27,5 @@
     public WaypointsNameCommand(WaypointTableModel waypointTM, int workingLine, String name,
             TransText shelter) {
+        super(MainApplication.getLayerManager().getEditDataSet());
         this.waypointTM = waypointTM;
         this.workingLine = workingLine;