--- a/jbrowse.xml	Wed Nov 15 15:15:27 2017 -0500
+++ b/jbrowse.xml	Thu Nov 16 09:44:45 2017 -0500
@@ -1,11 +1,11 @@
-<tool id="jbrowse" name="JBrowse" version="@WRAPPER_VERSION@.2">
+<tool id="jbrowse" name="JBrowse" version="@WRAPPER_VERSION@.3">
   <description>genome browser</description>
   <macros>
     <import>macros.xml</import>
   </macros>
   <expand macro="requirements"/>
   <expand macro="stdio"/>
-  <version_command>python jbrowse.py --version</version_command>
+  <version_command>python '${__tool_directory__}/jbrowse.py' --version</version_command>
   <command><![CDATA[
 
 #if $action.action_select == "create":
@@ -19,7 +19,7 @@
 cp $trackxml $output.files_path/galaxy.xml &&
 
 ## Once that's done, we run the python script to handle the real work
-python $__tool_directory__/jbrowse.py
+python '$__tool_directory__/jbrowse.py'
 
 --jbrowse \${JBROWSE_SOURCE_DIR}
 #if str($standalone) == "Complete":
@@ -73,7 +73,9 @@
         <gencode>$gencode</gencode>
         <genomes>
             #if str($reference_genome.genome_type_select) == "indexed":
-              <genome>${reference_genome.genomes.fields.path}</genome>
+              <genome path="${reference_genome.genomes.fields.path}">
+                  <metadata />
+              </genome>s
             #else
               #for $genome in $reference_genome.genomes:
                   <genome path="$genome">
@@ -495,7 +497,8 @@
                                   help="If your input files represents transcripts, give the name of the corresponding features here (e.g. 'mRNA' or 'transcript')"
                                   optional="True"/>
                       </section>
-                   </when>
+                  </when>
+                  <when value="BlastView/View/Track/CanvasFeatures" />
                 </conditional>
                 <expand macro="track_styling" />
                 <expand macro="color_selection" />
@@ -904,6 +907,15 @@
         <param name="uglyTestingHack" value="enabled" />
         <output name="output" file="track_config/test.xml" lines_diff="26"/>
     </test>
+    <test>
+        <!-- data_table -->
+        <param name="reference_genome|genome_type_select" value="indexed"/>
+        <param name="reference_genome|genomes" value="merlin"/>
+        <param name="gencode" value="1" />
+        <param name="standalone" value="Data Directory" />
+        <param name="uglyTestingHack" value="enabled" />
+        <output name="output" file="gencode/test-data_table.xml" lines_diff="4" />
+    </test>
   </tests>
   <help><![CDATA[
 JBrowse-in-Galaxy