Index: applications/editors/josm/plugins/tageditor/build.xml
===================================================================
--- applications/editors/josm/plugins/tageditor/build.xml	(revision 16881)
+++ applications/editors/josm/plugins/tageditor/build.xml	(revision 16919)
@@ -89,5 +89,5 @@
                 <attribute name="Plugin-Description" value="Provides a dialog for editing tags in a tabular grid."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/TagEditor"/>
-                <attribute name="Plugin-Mainversion" value="${coreversion.info.entry.revision}"/>
+                <attribute name="Plugin-Mainversion" value="1935"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
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 16881)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java	(revision 16919)
@@ -327,8 +327,8 @@
 
 		for (OsmPrimitive primitive : primitives) {
-			if (primitive.keys == null) {
+			if (primitive.getKeys() == null) {
 				continue;
 			}
-			for (String oldkey : primitive.keys.keySet()) {
+			for (String oldkey : primitive.keySet()) {
 				if (!currentkeys.contains(oldkey)) {
 					ChangePropertyCommand deleteCommand =