Index: trunk/ivy.xml
===================================================================
--- trunk/ivy.xml	(revision 16834)
+++ trunk/ivy.xml	(revision 16835)
@@ -31,5 +31,5 @@
         <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.22.0"/>
         <dependency conf="api->default" org="oauth.signpost" name="signpost-core" rev="2.0.0"/>
-        <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2020.7.15"/>
+        <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2020.8.3"/>
         <!-- sources->sources -->
         <dependency conf="sources->sources" org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.14"/>
@@ -43,5 +43,5 @@
         <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.22.0"/>
         <dependency conf="sources->sources" org="oauth.signpost" name="signpost-core" rev="2.0.0"/>
-        <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2020.7.15"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
+        <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2020.8.3"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->
         <!-- commonslang->default -->
         <dependency conf="commonslang->default" org="org.apache.commons" name="commons-lang3" rev="3.10"/>
Index: trunk/src/org/openstreetmap/josm/tools/Tag2Link.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Tag2Link.java	(revision 16834)
+++ trunk/src/org/openstreetmap/josm/tools/Tag2Link.java	(revision 16835)
@@ -57,5 +57,5 @@
 
     static final ListProperty PREF_SOURCE = new ListProperty("tag2link.source",
-            Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2020.7.15/index.json"));
+            Collections.singletonList("resource://META-INF/resources/webjars/tag2link/2020.8.3/index.json"));
 
     private Tag2Link() {
@@ -112,6 +112,9 @@
         }
         // We handle those keys ourselves
-        Stream.of("image", "url", "website", "wikidata", "wikimedia_commons")
-                .forEach(wikidataRules::remove);
+        wikidataRules.keySet().removeIf(key -> key.matches("^(.+[:_])?website([:_].+)?$")
+                || key.matches("^(.+[:_])?url([:_].+)?$")
+                || key.matches("wikimedia_commons|image")
+                || key.matches("wikipedia(:(?<lang>\\p{Lower}{2,}))?")
+                || key.matches("(.*:)?wikidata"));
 
         final int size = wikidataRules.size();