--- a/qiime2/qiime_diversity_core-metrics-phylogenetic.xml	Wed Jul 17 01:53:11 2019 -0400
+++ b/qiime2/qiime_diversity_core-metrics-phylogenetic.xml	Tue Aug 13 07:40:25 2019 -0400
@@ -9,22 +9,28 @@
 
 --i-table=$itable
 --i-phylogeny=$iphylogeny
---p-sampling-depth="$psamplingdepth"
+
+#if str($psamplingdepth):
+ --p-sampling-depth="$psamplingdepth"
+#end if
 
 #set $pnjobs = '${GALAXY_SLOTS:-4}'
 #if str($pnjobs):
  --p-n-jobs="$pnjobs"
 #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')
+	#set $file_list = $file_list + ' --m-metadata-file=' + d['additional_input'].__getattr__('file_name')
 #end for
 #return $file_list
 #end def
+--m-metadata-file=$list_dict_to_string($input_files_mmetadatafile)
+#end if
 
---m-metadata-file=$list_dict_to_string($input_files_mmetadatafile)
 
 
 --o-rarefied-table=orarefiedtable
@@ -76,8 +82,8 @@
 		<param format="qza,no_unzip.zip" label="--i-phylogeny: ARTIFACT  Phylogenetic tree containing tip identifiers that Phylogeny[Rooted]     correspond to the feature identifiers in the table. This tree can contain tip ids that are not present in the table, but all feature ids in the table must be present in this tree.                  [required]" name="iphylogeny" optional="False" type="data"/>
 		<param label="--p-sampling-depth: INTEGER Range(1, None)        The total frequency that each sample should be rarefied to prior to computing diversity metrics. [required]" name="psamplingdepth" optional="False" min="1" value="" type="integer"/>
 
-		<repeat name="input_files_mmetadatafile" optional="False" title="--m-metadata-file">
-			<param label="--m-metadata-file:  (multiple arguments will be merged) The sample metadata to use in the emperor plots. [required]" name="additional_input" type="data" format="tabular,qza,no_unzip.zip" />
+		<repeat name="input_files_mmetadatafile" optional="False" title="--m-metadata-file [required]">
+			<param label="--m-metadata-file:  (multiple arguments will be merged) The sample metadata to use in the emperor plots. [required]" name="additional_input" optional="False" type="data" format="tabular,qza,no_unzip.zip" />
 		</repeat>
 
 	</inputs>