Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikidataTagCellRenderer.java
===================================================================
--- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikidataTagCellRenderer.java	(revision 31857)
+++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikidataTagCellRenderer.java	(revision 31858)
@@ -14,5 +14,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.LanguageInfo;
-import org.testng.internal.Utils;
+import org.openstreetmap.josm.tools.Utils;
 
 public class WikidataTagCellRenderer extends DefaultTableCellRenderer {
@@ -56,6 +56,6 @@
             final String label = labelCache.get(id).isDone() ? labelCache.get(id).get() : null;
             final JLabel component = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-            component.setText("<html>" + Utils.escapeHtml(id) + (label != null
-                    ? " <span color='gray'>" + Utils.escapeHtml(label) + "</span>"
+            component.setText("<html>" + Utils.escapeReservedCharactersHTML(id) + (label != null
+                    ? " <span color='gray'>" + Utils.escapeReservedCharactersHTML(label) + "</span>"
                     : ""));
             component.setToolTipText(label);
