--- a/hmmsearch.xml	Wed Apr 04 14:00:41 2018 -0400
+++ b/hmmsearch.xml	Sat Apr 07 03:49:37 2018 -0400
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tool id="hmmer_hmmsearch" name="hmmsearch" version="@WRAPPER_VERSION@.0">
+<tool id="hmmer_hmmsearch" name="hmmsearch" version="@TOOL_VERSION@">
   <description>search profile(s) against a sequence database</description>
   <macros>
     <import>macros.xml</import>
@@ -17,10 +17,10 @@
 @CPU@
 @SEED@
 
-$hmmfile
-$seqdb
-> $output
-      ]]></command>
+'$hmmfile'
+'$seqdb'
+> '$output'
+  ]]></command>
   <inputs>
     <expand macro="input_hmm" />
     <!-- todo use Galaxy features like data libraries/data tables/??? -->
@@ -33,14 +33,14 @@
     <expand macro="seed"/>
   </inputs>
   <outputs>
-    <data format="txt" name="output" label="HMM matches of $hmmfile.name in $seqdb.name"/>
-    <data format="txt" name="tblout" label="Table of per-sequence hits from HMM matches of $hmmfile.name in $seqdb.name">
+    <data name="output" format="txt" label="HMM matches of $hmmfile.name in $seqdb.name"/>
+    <data name="tblout" format="txt" label="Table of per-sequence hits from HMM matches of $hmmfile.name in $seqdb.name">
       <filter>oformat and 'tblout' in oformat</filter>
     </data>
-    <data format="txt" name="domtblout" label="Table of per-domain hits from HMM matches of $hmmfile.name in $seqdb.name">
+    <data name="domtblout" format="txt" label="Table of per-domain hits from HMM matches of $hmmfile.name in $seqdb.name">
       <filter>oformat and 'domtblout' in oformat</filter>
     </data>
-    <data format="txt" name="pfamtblout" label="Table of per-sequence/per-domain hits from HMM matches of $hmmfile.name in $seqdb.name">
+    <data name="pfamtblout" format="txt" label="Table of per-sequence/per-domain hits from HMM matches of $hmmfile.name in $seqdb.name">
       <filter>oformat and 'pfamtblout' in oformat</filter>
     </data>
   </outputs>
@@ -75,6 +75,6 @@
 @SEED_HELP@
 
 @ATTRIBUTION@
-]]></help>
+  ]]></help>
   <expand macro="citation"/>
 </tool>