--- a/gemini_comp_hets.xml	Mon Aug 25 16:37:46 2014 -0400
+++ b/gemini_comp_hets.xml	Wed Feb 18 11:36:37 2015 -0500
@@ -14,9 +14,8 @@
                 --columns "${report.columns}"
             #end if
 
-            #if $filter.filter_selector == 'yes':
-                --filter "${filter.filter}"
-            #end if
+            @CMDLN_SQL_FILTER_FILTER_OPTION@
+
             $only_affected
             $ignore_phasing
 
@@ -26,7 +25,7 @@
     </command>
     <expand macro="stdio" />
     <inputs>
-        <param name="infile" type="data" format="sqlite" label="GEMINI database" />
+        <expand macro="infile" />
         <expand macro="add_header_column" />
         <expand macro="column_filter" />
         <param name="only_affected" type="boolean" truevalue="--only-affected" falsevalue="" checked="False" 
@@ -36,7 +35,7 @@
         <expand macro="filter" />
     </inputs>
     <outputs>
-        <data name="outfile" format="tabular" label="${tool.name} on ${on_string}" />
+        <data name="outfile" format="tabular" />
     </outputs>
     <tests>
         <test>