Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 16525)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 16526)
@@ -516,21 +516,14 @@
         Object obj = getSelectedItem();
         String display = obj == null ? getDisplayIfNull() : obj.toString();
-        String value = null;
-
-        if (display != null) {
-            for (PresetListEntry entry : presetListEntries) {
-                String k = entry.toString();
-                if (k.equals(display)) {
-                    value = entry.value;
-                    break;
-                }
-            }
-            if (value == null) {
-                value = display;
-            }
-        } else {
-            value = "";
-        }
-        return Utils.removeWhiteSpaces(value);
+
+        if (display == null) {
+            return "";
+        }
+        return presetListEntries.stream()
+                .filter(entry -> Objects.equals(entry.toString(), display))
+                .findFirst()
+                .map(entry -> entry.value)
+                .map(Utils::removeWhiteSpaces)
+                .orElse(display);
     }