--- a/gemini_query.xml	Mon Aug 25 04:25:41 2014 -0400
+++ b/gemini_query.xml	Mon Aug 25 08:07:37 2014 -0400
@@ -51,9 +51,15 @@
     <inputs>
         <param name="infile" type="data" format="sqlite" label="GEMINI database" />
 
-        <param name="q" type="text" area="True" size="5x50" label="The query to be issued to the database" help="(-q)"/>
-        <param name="gt_filter" type="text" area="True" size="5x50" label="Restrictions to apply to genotype values" help="(--gt-filer)"/>
-        <param name="sample_filter" type="text" area="True" size="5x50" label="SQL filter to use to filter the sample table" help="(--sample-filter)"/>
+        <param name="q" type="text" area="True" size="5x50" label="The query to be issued to the database" help="(-q)">
+            <expand macro="sanitize_query" />
+        </param>
+        <param name="gt_filter" type="text" area="True" size="5x50" label="Restrictions to apply to genotype values" help="(--gt-filer)">
+            <expand macro="sanitize_query" />
+        </param>
+        <param name="sample_filter" type="text" area="True" size="5x50" label="SQL filter to use to filter the sample table" help="(--sample-filter)">
+            <expand macro="sanitize_query" />
+        </param>
 
         <param name="show_samples" type="boolean" truevalue="--show-samples" falsevalue="" checked="False" 
             label="Add a column of all sample names with a variant to each variant" help="(--show-samples)"/>