--- a/qiime2/qiime_longitudinal_nmit.xml	Sun Jul 21 02:21:34 2019 -0400
+++ b/qiime2/qiime_longitudinal_nmit.xml	Wed Jul 31 03:06:00 2019 -0400
@@ -8,7 +8,21 @@
 qiime longitudinal nmit
 
 --i-table=$itable
---p-individual-id-column="$pindividualidcolumn"
+
+
+
+
+#if '__sq__' in str($pindividualidcolumn):
+  #set $pindividualidcolumn_temp = $pindividualidcolumn.replace('__sq__', "'")
+  #set $pindividualidcolumn = $pindividualidcolumn_temp
+#end if
+
+#if str($pindividualidcolumn):
+ --p-individual-id-column="$pindividualidcolumn"
+#end if
+
+
+
 
 #if str($pcorrmethod) != 'None':
  --p-corr-method=$pcorrmethod
@@ -50,7 +64,7 @@
 			<option value="nuc">nuc</option>
 		</param>
 
-		<repeat name="input_files_mmetadatafile" optional="True" title="--m-metadata-file">
+		<repeat name="input_files_mmetadatafile" optional="True" title="--m-metadata-file  [required]">
 			<param label="--m-metadata-file: Metadata file or artifact viewable as metadata. This option may be supplied multiple times to merge metadata. [optional]" name="additional_input" type="data" format="tabular,qza,no_unzip.zip" />
 		</repeat>