--- a/macros.xml	Wed Aug 10 13:15:57 2022 +0000
+++ b/macros.xml	Tue Aug 23 08:00:30 2022 +0000
@@ -601,34 +601,34 @@
     <xml name="out_ag">
         <data name="out_ag" format="fastg" from_work_dir="output/assembly_graph.fastg" label="${tool.name} on ${on_string}: Assembly graph">
             <filter>'ag' in optional_output</filter>
-            <filter> operation_mode != '--only-error-correction'</filter>
+            <filter>'operation_mode' not in vars() or operation_mode != '--only-error-correction'</filter>
         </data>
     </xml>
     <xml name="out_ags">
         <data name="out_ags" format="txt" from_work_dir="output/assembly_graph_with_scaffolds.gfa" label="${tool.name} on ${on_string}: Assembly graph with scaffolds">
             <filter>'ags' in optional_output</filter>
-            <filter> operation_mode != '--only-error-correction'</filter>
+            <filter>'operation_mode' not in vars() or  operation_mode != '--only-error-correction'</filter>
         </data>
     </xml>
     <xml name="out_cn">
         <data name="out_cn" format="fasta" from_work_dir="output/contigs.fasta" label="${tool.name} on ${on_string}: Contigs">
             <filter>'cn' in optional_output</filter>
-            <filter> operation_mode != '--only-error-correction'</filter>
+            <filter>'operation_mode' not in vars() or  operation_mode != '--only-error-correction'</filter>
         </data>
     </xml>
     <xml name="out_cp">
         <data name="out_cp" format="txt" from_work_dir="output/contigs.paths" label="${tool.name} on ${on_string}: Contigs paths">
             <filter>'cp' in optional_output</filter>
-            <filter> operation_mode != '--only-error-correction'</filter>
+            <filter>'operation_mode' not in vars() or  operation_mode != '--only-error-correction'</filter>
         </data>
     </xml>
     <xml name="out_cr">
         <!-- some mode combinations create fastq, some fasta -->
         <collection name="out_cr" type="list" label="${tool.name} on ${on_string}: Corrected reads">
             <filter>'cr' in optional_output</filter>
-            <filter> operation_mode != '--only-assembler'</filter>
-            <discover_datasets pattern="(?P&lt;designation&gt;.+)\.fastq\.gz" format="fastq" directory="output/corrected"/>
-            <discover_datasets pattern="(?P&lt;designation&gt;.+)\.fasta\.gz" format="fasta" directory="output/corrected"/>
+            <filter>'operation_mode' not in vars() or operation_mode != '--only-assembler'</filter>
+            <discover_datasets pattern="(?P&lt;designation&gt;.+)\.cor\.fastq\.gz" format="fastq" directory="output/corrected"/>
+            <discover_datasets pattern="(?P&lt;designation&gt;.+)\.cor\.fasta\.gz" format="fasta" directory="output/corrected"/>
         </collection>
     </xml>
     <xml name="out_cs">
@@ -637,7 +637,7 @@
                 <action name="column_names" type="metadata" default="name,length,coverage"/>
             </actions>
             <filter>'cs' in optional_output</filter>
-            <filter> operation_mode != '--only-error-correction'</filter>
+            <filter>'operation_mode' not in vars() or operation_mode != '--only-error-correction'</filter>
         </data>
     </xml>
     <xml name="out_l">
@@ -648,13 +648,13 @@
     <xml name="out_sc">
         <data name="out_sc" format="fasta" from_work_dir="output/scaffolds.fasta" label="${tool.name} on ${on_string}: Scaffolds">
             <filter>'sc' in optional_output</filter>
-            <filter> operation_mode != '--only-error-correction'</filter>
+            <filter>'operation_mode' not in vars() or operation_mode != '--only-error-correction'</filter>
         </data>
     </xml>
     <xml name="out_sp">
         <data name="out_sp" format="txt" from_work_dir="output/scaffolds.paths" label="${tool.name} on ${on_string}: Scaffolds paths">
             <filter>'sp' in optional_output</filter>
-            <filter> operation_mode != '--only-error-correction'</filter>
+            <filter>'operation_mode' not in vars() or operation_mode != '--only-error-correction'</filter>
         </data>
     </xml>
     <xml name="out_ss">
@@ -663,7 +663,7 @@
                 <action name="column_names" type="metadata" default="name,length,coverage"/>
             </actions>
             <filter>'ss' in optional_output</filter>
-            <filter> operation_mode != '--only-error-correction'</filter>
+            <filter>'operation_mode' not in vars() or operation_mode != '--only-error-correction'</filter>
         </data>
     </xml>
     <xml name="out_rs">