--- a/macros.xml	Sat Nov 27 09:48:10 2021 +0000
+++ b/macros.xml	Fri Apr 22 13:51:34 2022 +0000
@@ -1,6 +1,6 @@
 <macros>
-    <token name="@TOOL_VERSION@">2.0.8</token>
-
+    <token name="@TOOL_VERSION@">2.0.15</token>
+    <token name="@VERSION_SUFFIX@">0</token>
     <xml name="requirements">
         <requirements>
           <requirement type="package" version="@TOOL_VERSION@">diamond</requirement>
@@ -19,7 +19,7 @@
 
     <xml name="output_type_macro">
         <conditional name="output">
-            <param argument="--outfmt" type="select" label="Format of output file " help="">
+            <param argument="--outfmt" type="select" label="Format of output file" help="">
                 <option value="0">BLAST pairwise</option>
                 <option value="5">BLAST XML</option>
                 <option value="6">BLAST tabular</option>
@@ -90,21 +90,26 @@
                 <option value="top">Percentage of top alignment score</option>
             </param>
             <when value="max">
-                <param name="max_target_seqs" argument="--max-target-seqs" type="integer" value="25" label="The maximum number of target sequences per query to report alignments for" help="Setting this to 0 will report all alignments that were found." />
+                <param name="max_target_seqs" argument="--max-target-seqs" type="integer" value="25" label="The maximum number of target sequences per query to report alignments for" 
+                    help="Setting this to 0 will report all alignments that were found." />
             </when>
             <when value="top">
-                <param argument="--top" type="integer" value="0" label="Keep alignments within the given percentage range of the top alignment score for a query" help="For example, setting this to 10 will report all align-
-ments whose score is at most 10% lower than the best alignment score for a query." />
+                <param argument="--top" type="integer" value="0" label="Keep alignments within the given percentage range of the top alignment score for a query" 
+                    help="For example, setting this to 10 will report all alignments whose score is at most 10% lower than the best alignment score for a query." />
             </when>
         </conditional>
     </xml>
 
     <xml name="block_size_low_sens">
-        <param argument="--block-size" type="float" value="2" label="Block size in billions of sequence letters to be processed at a time" help="" />
+        <param argument="--block-size" type="float" value="2" label="Block size in billions of sequence letters to be processed at a time" 
+            help="This is the main parameter for controlling the program’s memory and disk space usage. Bigger numbers will increase the use of memory and temporary 
+                disk space, but also improve performance" />
     </xml>
 
     <xml name="block_size_hi_sens">
-        <param argument="--block-size" type="float" value="0.4" label="Block size in billions of sequence letters to be processed at a time" help="" />
+        <param argument="--block-size" type="float" value="0.4" label="Block size in billions of sequence letters to be processed at a time" 
+            help="This is the main parameter for controlling the program’s memory and disk space usage. Bigger numbers will increase the use of memory and temporary 
+                disk space, but also improve performance" />
     </xml>
 
     <xml name="citations">
@@ -116,48 +121,48 @@
 
     <xml name="output_macro">
         <data format="txt" name="blast_pairw" label="${tool.name} on ${on_string}">
-            <filter>output["outfmt"] == "0"</filter>
+            <filter>output_section["output"]["outfmt"] == "0"</filter>
         </data>
         <data format="xml" name="blast_xml" label="${tool.name} on ${on_string}">
-            <filter>output["outfmt"] == "5"</filter>
+            <filter>output_section["output"]["outfmt"] == "5"</filter>
         </data>
         <data format="tabular" name="blast_tabular" label="${tool.name} on ${on_string}">
-            <filter>output["outfmt"] == "6"</filter>
+            <filter>output_section["output"]["outfmt"] == "6"</filter>
         </data>
         <!-- for daa diamond appends the .daa extension -> hence from_work_dir -->
         <data format="daa" name="daa_output" label="${tool.name} on ${on_string}" from_work_dir="output.daa">
-            <filter>output["outfmt"] == "100"</filter>
+            <filter>output_section["output"]["outfmt"] == "100"</filter>
         </data>
         <data format="sam" name="sam_output" label="${tool.name} on ${on_string}">
-            <filter>output["outfmt"] == "101"</filter>
+            <filter>output_section["output"]["outfmt"] == "101"</filter>
         </data>
         <data format="tabular" name="tax_output" label="${tool.name} on ${on_string}">
-            <filter>output["outfmt"] == "102"</filter>
+            <filter>output_section["output"]["outfmt"] == "102"</filter>
         </data>
     </xml>
 
     <token name="@OUTPUT_ARGS@">
-        #if $output.outfmt == "0"
+        #if $output_section.output.outfmt == "0"
             --outfmt '0'
             --out '$blast_pairw'
-        #else if $output.outfmt == "5"
+        #else if $output_section.output.outfmt == "5"
             --outfmt '5'
             --out '$blast_xml'
-        #else if $output.outfmt == "6"
-            --outfmt '6' #echo ' '.join(str($output.fields).split(','))
+        #else if $output_section.output.outfmt == "6"
+            --outfmt '6' #echo ' '.join(str($output_section.output.fields).split(','))
             --out '$blast_tabular'
-            --unal $output.unal
-        #else if $output.outfmt == "100"
+            --unal $output_section.output.unal
+        #else if $output_section.output.outfmt == "100"
             --outfmt '100'
-            $output.salltitles
-            $output.sallseqid
+            $output_section.output.salltitles
+            $output_section.output.sallseqid
             --out output.daa
-        #else if $output.outfmt == "101"
+        #else if $output_section.output.outfmt == "101"
             --outfmt '101'
-            $output.salltitles
-            $output.sallseqid
+            $output_section.output.salltitles
+            $output_section.output.sallseqid
             --out '$sam_output'
-        #else if $output.outfmt == "102"
+        #else if $output_section.output.outfmt == "102"
             --outfmt '102'
             --out '$tax_output'
         #end if