--- a/qiime2/qiime_diversity_beta-correlation.xml	Wed Jul 17 01:53:11 2019 -0400
+++ b/qiime2/qiime_diversity_beta-correlation.xml	Tue Aug 13 07:40:25 2019 -0400
@@ -8,39 +8,62 @@
 qiime diversity beta-correlation
 
 --i-distance-matrix=$idistancematrix
+
+
+
+#if '__sq__' in str($mmetadatacolumn):
+  #set $mmetadatacolumn_temp = $mmetadatacolumn.replace('__sq__', "'")
+  #set $mmetadatacolumn = $mmetadatacolumn_temp
+#end if
+
 --m-metadata-column="$mmetadatacolumn"
 
+
+
 #if str($pmethod) != 'None':
  --p-method=$pmethod
 #end if
 
-#if $ppermutations:
+#if str($ppermutations):
  --p-permutations=$ppermutations
 #end if
 
-#if $pintersectids:
+#if str($pintersectids):
  --p-intersect-ids
 #end if
 
+
+
+
+#if '__sq__' in str($plabel1):
+  #set $plabel1_temp = $plabel1.replace('__sq__', "'")
+  #set $plabel1 = $plabel1_temp
+#end if
+
 #if str($plabel1):
  --p-label1="$plabel1"
 #end if
 
+
+
+#if '__sq__' in str($plabel2):
+  #set $plabel2_temp = $plabel2.replace('__sq__', "'")
+  #set $plabel2 = $plabel2_temp
+#end if
+
 #if str($plabel2):
  --p-label2="$plabel2"
 #end if
 
-#if $input_files_mmetadatafile:
-#def list_dict_to_string(list_dict):
-#set $file_list = list_dict[0]['additional_input'].__getattr__('file_name')
-#for d in list_dict[1:]:
-	#set $file_list = $file_list + ',' + d['additional_input'].__getattr__('file_name')
-#end for
-#return $file_list
-#end def
---m-metadata-file=$list_dict_to_string($input_files_mmetadatafile)
+
+
+#if $metadatafile:
+ --m-metadata-file=$metadatafile
 #end if
 
+
+
+
 --o-metadata-distance-matrix=ometadatadistancematrix
 --o-mantel-scatter-visualization=omantelscattervisualization
 ;
@@ -59,11 +82,11 @@
 		</param>
 		<param label="--p-permutations: INTEGER Range(0, None)     The number of permutations to be run when computing p-values. Supplying a value of zero will disable permutation testing and p-values will not be calculated (this results in *much* quicker execution time if p-values are not desired).               [default: 999]" name="ppermutations" optional="True" type="integer" min="0" value="999"/>
 		<param label="--p-intersect-ids: --p-no-intersect-ids If supplied, IDs that are not found in both distance matrices will be discarded before applying the Mantel test. Default behavior is to error on any mismatched IDs.                                   [default: False]" name="pintersectids" selected="False" type="boolean"/>
-		<param label="--p-label1: TEXT      Label for `distance-matrix` in the output visualization.                    [default: 'Metadata']" name="plabel1" optional="True" type="text" value="'Metadata'"/>
-		<param label="--p-label2: TEXT      Label for `metadata-distance-matrix` in the output visualization.             [default: 'Distance Matrix']" name="plabel2" optional="True" type="text" value="'Distance Matrix'"/>
-		<repeat name="input_files_mmetadatafile" optional="True" title="--m-metadata-file">
-			<param label="--m-metadata-file" name="additional_input" type="data" format="tabular,qza,no_unzip.zip" />
-		</repeat>
+		<param label="--p-label1: TEXT      Label for `distance-matrix` in the output visualization.                    [default: 'Metadata']" name="plabel1" optional="True" type="text" value="Metadata"/>
+		<param label="--p-label2: TEXT      Label for `metadata-distance-matrix` in the output visualization.             [default: 'Distance Matrix']" name="plabel2" optional="True" type="text" value="Distance Matrix"/>
+
+		<param label="--m-metadata-file METADATA" name="metadatafile" type="data" format="tabular,qza,no_unzip.zip" optional="True" />
+
 	</inputs>
 	<outputs>
 		<data format="qza" label="${tool.name} on ${on_string}: metadatadistancematrix.qza" name="ometadatadistancematrix"/>