Index: /trunk/src/org/openstreetmap/josm/tools/Tag2Link.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Tag2Link.java	(revision 19616)
+++ /trunk/src/org/openstreetmap/josm/tools/Tag2Link.java	(revision 19617)
@@ -215,8 +215,8 @@
             final String formattedValue = valueFormatter.getOrDefault(key, x -> x).apply(value);
 
-            final String urlKey = formatterUrls.stream().map(urlFormatter -> PATTERN_DOLLAR_ONE.matcher(urlFormatter)
+            final String urlKey = Utils.encodeUrl(formatterUrls.stream().map(urlFormatter -> PATTERN_DOLLAR_ONE.matcher(urlFormatter)
                             .replaceAll(Matcher.quoteReplacement("(.*)"))).map(PatternUtils::compile)
                             .map(pattern -> pattern.matcher(value)).filter(Matcher::matches)
-                            .map(matcher -> matcher.group(1)).findFirst().orElse(formattedValue);
+                            .map(matcher -> matcher.group(1)).findFirst().orElse(formattedValue));
 
             formatterUrls.forEach(urlFormatter -> {