--- a/gemini_region.xml	Mon Aug 25 16:37:46 2014 -0400
+++ b/gemini_region.xml	Wed Feb 18 11:36:37 2015 -0500
@@ -24,9 +24,7 @@
                 --columns "${report.columns}"
             #end if
 
-            #if $filter.filter_selector == 'yes':
-                --filter "${filter.filter}"
-            #end if
+            @CMDLN_SQL_FILTER_FILTER_OPTION@
 
             $header
             "${ infile }"
@@ -35,7 +33,7 @@
     </command>
     <expand macro="stdio" />
     <inputs>
-        <param name="infile" type="data" format="sqlite" label="GEMINI database" />
+        <expand macro="infile" />
 
         <conditional name="region">
             <param name="region_selector" type="select" label="Select by ...?" help="">
@@ -58,7 +56,7 @@
 
     </inputs>
     <outputs>
-        <data name="outfile" format="tabular" label="${tool.name} on ${on_string}" />
+        <data name="outfile" format="tabular" />
     </outputs>
     <tests>
         <test>