--- a/macros.xml	Tue Nov 02 09:40:29 2021 +0000
+++ b/macros.xml	Fri Nov 05 08:41:35 2021 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <macros>
     <token name="@TOOL_VERSION@">5.2.2</token>
-    <token name="@VERSION_SUFFIX@">1</token>
+    <token name="@VERSION_SUFFIX@">2</token>
 
     <xml name="citations">
         <citations>
@@ -14,7 +14,6 @@
         <option value="human">Homo sapiens</option>
         <option value="fly">Drosophila melanogaster</option>
         <option value="arabidopsis">Arabidopsis thaliana</option>
-        <option value="brugia ">Brugia malayi</option>
         <option value="aedes">Aedes aegypti</option>
         <option value="tribolium2012">Tribolium castaneum</option>
         <option value="schistosoma">Schistosoma mansoni</option>
@@ -22,41 +21,38 @@
         <option value="galdieria">Galdieria sulphuraria</option>
         <option value="maize">Zea mays</option>
         <option value="toxoplasma">Toxoplasma gondii</option>
-        <option value="caenorhabditis ">Caenorhabditis elegans</option>
+        <option value="caenorhabditis">Caenorhabditis elegans</option>
         <option value="aspergillus_fumigatus">Aspergillus fumigatus</option>
-        <option value="aspergillus_nidulans ">Aspergillus nidulans</option>
-        <option value="aspergillus_oryzae ">Aspergillus oryzae</option>
+        <option value="aspergillus_nidulans">Aspergillus nidulans</option>
+        <option value="aspergillus_oryzae">Aspergillus oryzae</option>
         <option value="aspergillus_terreus">Aspergillus terreus</option>
-        <option value="botrytis_cinerea ">Botrytis cinerea</option>
-        <option value="candida_albicans ">Candida albicans</option>
-        <option value="candida_guilliermondii ">Candida guilliermondii</option>
-        <option value="candida_tropicalis ">Candida tropicalis</option>
+        <option value="botrytis_cinerea">Botrytis cinerea</option>
+        <option value="candida_albicans">Candida albicans</option>
+        <option value="candida_guilliermondii">Candida guilliermondii</option>
+        <option value="candida_tropicalis">Candida tropicalis</option>
         <option value="chaetomium_globosum">Chaetomium globosum</option>
         <option value="coccidioides_immitis">Coccidioides immitis</option>
-        <option value="coprinus">Coprinus cinereus</option>
         <option value="coprinus_cinereus">Coprinus cinereus</option>
         <option value="cryptococcus_neoformans_gattii">Cryptococcus neoformans gattii</option>
-        <option value="cryptococcus_neoformans_neoformans_B">Cryptococcus neoformans neoformans</option>
-        <option value="cryptococcus_neoformans_neoformans_JEC21">Cryptococcus neoformans neoformans</option>
-        <option value="cryptococcus">Cryptococcus neoformans</option>
+        <option value="cryptococcus_neoformans_neoformans_B">Cryptococcus neoformans neoformans B</option>
+        <option value="cryptococcus_neoformans_neoformans_JEC21">Cryptococcus neoformans neoformans JEC21</option>
         <option value="debaryomyces_hansenii">Debaryomyces hansenii</option>
         <option value="encephalitozoon_cuniculi_GB">Encephalitozoon cuniculi</option>
         <option value="eremothecium_gossypii">Eremothecium gossypii</option>
-        <option value="fusarium_graminearum ">Fusarium graminearum</option>
-        <option value="histoplasma_capsulatum ">Histoplasma capsulatum</option>
-        <option value="histoplasma">Histoplasma capsulatum</option>
-        <option value="kluyveromyces_lactis ">Kluyveromyces lactis</option>
-        <option value="laccaria_bicolor ">Laccaria bicolor</option>
+        <option value="fusarium_graminearum">Fusarium graminearum</option>
+        <option value="histoplasma_capsulatum">Histoplasma capsulatum</option>
+        <option value="kluyveromyces_lactis">Kluyveromyces lactis</option>
+        <option value="laccaria_bicolor">Laccaria bicolor</option>
         <option value="lamprey">Petromyzon marinus</option>
         <option value="leishmania_tarentolae">Leishmania tarentolae</option>
         <option value="lodderomyces_elongisporus">Lodderomyces elongisporus</option>
-        <option value="magnaporthe_grisea ">Magnaporthe grisea</option>
+        <option value="magnaporthe_grisea">Magnaporthe grisea</option>
         <option value="neurospora_crassa">Neurospora crassa</option>
         <option value="phanerochaete_chrysosporium">Phanerochaete chrysosporium</option>
         <option value="pichia_stipitis">Pichia stipitis</option>
         <option value="rhizopus_oryzae">Rhizopus oryzae</option>
-        <option value="saccharomyces_cerevisiae_S288C">Saccharomyces cerevisiae</option>
-        <option value="saccharomyces_cerevisiae_rm11-1a_1">Saccharomyces cerevisiae</option>
+        <option value="saccharomyces_cerevisiae_S288C">Saccharomyces cerevisiae S288C</option>
+        <option value="saccharomyces_cerevisiae_rm11-1a_1">Saccharomyces cerevisiae rm11-1a_1</option>
         <option value="saccharomyces">Saccharomyces cerevisiae</option>
         <option value="schizosaccharomyces_pombe">Schizosaccharomyces pombe</option>
         <option value="trichinella">Trichinella spiralis</option>
@@ -79,20 +75,16 @@
         <option value="thermoanaerobacter_tengcongensis">Thermoanaerobacter tengcongensis</option>
         <option value="wheat">wheat</option>
         <option value="zebrafish">Danio rerio</option>
-        <option value="anidulans">Aspergillus nidulans</option>
         <option value="bombus_impatiens1">Bombus impatiens1</option>
         <option value="bombus_terrestris2">Bombus terrestris2</option>
-        <option value="botrytis_cinerea">Botrytis cinerea</option>
         <option value="brugia_malayi">Brugia malayi</option>
         <option value="conidiobolus_coronatus">Conidiobolus coronatus</option>
         <option value="cryptococcus_neoformans">Cryptococcus neoformans</option>
         <option value="culex_pipiens">Culex pipiens</option>
         <option value="elephant_shark">Callorhinchus milii</option>
         <option value="honeybee1">Apis mellifera</option>
-        <option value="phanerochaete_chrysosporium">Phanerochaete chrysosporium</option>
         <option value="pea_aphid">Acyrthosiphon pisum</option>
         <option value="rhodnius_prolixus">Rhodnius prolixus</option>
-        <option value="ustilago_maydis">Ustilago maydis</option>
         <option value="verticillium_albo_atrum1">Verticillium albo atrum1</option>
         <option value="verticillium_longisporum1">Verticillium longisporum1</option>
         <option value="Xipophorus_maculatus">Xipophorus_maculatus</option>