Index: trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(revision 13390)
+++ trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(revision 13391)
@@ -492,9 +492,9 @@
             String key = keyList.get(i);
             sb.append("<strong>")
-              .append(key)
+              .append(Utils.escapeReservedCharactersHTML(key))
               .append("</strong>=");
             String value = tags.get(key);
             while (!value.isEmpty()) {
-                sb.append(value.substring(0, Math.min(50, value.length())));
+                sb.append(Utils.escapeReservedCharactersHTML(value.substring(0, Math.min(50, value.length()))));
                 if (value.length() > 50) {
                     sb.append("<br>");