Index: applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml
===================================================================
--- applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml	(revision 33381)
+++ applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml	(revision 33382)
@@ -57,4 +57,8 @@
             <link name="View Wikidata page" href="https://www.wikidata.org/wiki/%v%" />
         </rule>
+        <rule>
+            <condition k="species"/>
+            <link name="View Wikispecies page" href="https://species.wikimedia.org/wiki/%v%" />
+        </rule>
     </src>
 
@@ -180,5 +184,5 @@
         <rule>
             <condition k="ref:FR:NAF" v="[A-Z0-9-]{5}" />
-            <link name="View explanation of %name% code" href="http://www.rouen.cci.fr/outils/ape/Naf_liste.asp?param=2&amp;code=%v%" />
+            <link name="View INSEE explanation of %name% code" href="http://recherche-naf.insee.fr/SIRENET_ClassesNaf/%v%.htm" />
         </rule>
     </src>
Index: applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkPlugin.java
===================================================================
--- applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkPlugin.java	(revision 33381)
+++ applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkPlugin.java	(revision 33382)
@@ -27,20 +27,6 @@
  * Main class of tag2link plugin.
  * @author Don-vip
- * History:
- * 0.3d 15-Aug-2012 Add ref:(FR:)?FINESS and osm.fr link for ref:(FR:)?INSEE (josm#7961)
- * 0.3c 22-Dec-2011 Add contact namespace for website
- * 0.3b 29-Oct-2011 Add UAI support
- * 0.3a 29-Oct-2011 Add Country-code prefix, IGN support + not-yet-tested POST requests support
- * 0.2d 24-Oct-2011 Icon for Mail action
- * 0.2c 24-Oct-2011 Another MHS rule
- * 0.2b 24-Oct-2011 UNESCO WHC rule working
- * 0.2a 23-Oct-2011 add Mail support + initial work on UNESCO WHC
- * 0.1c 23-Oct-2011 add MHS rule (French heritage)
- * 0.1b 22-Oct-2011 add CEF rule (French christian churches)
- * 0.1  22-Oct-2011 first working prototype
  */
 public class Tag2LinkPlugin extends Plugin {
-
-    // private Tag2LinkPreferenceSetting preferenceSetting; TODO
 
     private SelectionPopupListener selectionPopupListener;
@@ -55,19 +41,7 @@
     public Tag2LinkPlugin(PluginInformation info) {
         super(info);
-        // this.preferenceSetting = new Tag2LinkPreferenceSetting();
         Tag2LinkRuleChecker.init();
     }
 
-    /* (non-Javadoc)
-     * @see org.openstreetmap.josm.plugins.Plugin#getPreferenceSetting()
-     */
-//    @Override
-//    public PreferenceSetting getPreferenceSetting() {
-//        return this.preferenceSetting;
-//    }
-
-    /* (non-Javadoc)
-     * @see org.openstreetmap.josm.plugins.Plugin#mapFrameInitialized(org.openstreetmap.josm.gui.MapFrame, org.openstreetmap.josm.gui.MapFrame)
-     */
     @Override
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
Index: applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleChecker.java
===================================================================
--- applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleChecker.java	(revision 33381)
+++ applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleChecker.java	(revision 33382)
@@ -110,5 +110,5 @@
                 try {
                     // Special hack for Wikipedia that prevents spaces being replaced by "+" characters, but by "_"
-                    if (s.contains("wikipedia.") || s.contains("commons.wikimedia.org")) {
+                    if (s.contains("wikipedia.") || s.contains(".wikimedia.org")) {
                         val = val.replaceAll(" ", "_");
                     }