--- a/qiime2/qiime_feature-classifier_classify-consensus-blast.xml	Wed Jul 17 01:53:11 2019 -0400
+++ b/qiime2/qiime_feature-classifier_classify-consensus-blast.xml	Tue Aug 13 07:40:25 2019 -0400
@@ -19,15 +19,15 @@
 #end if
 
 
-#if $pmaxaccepts:
+#if str($pmaxaccepts):
  --p-maxaccepts=$pmaxaccepts
 #end if
 
-#if $ppercidentity:
+#if str($ppercidentity):
  --p-perc-identity=$ppercidentity
 #end if
 
-#if $pquerycov:
+#if str($pquerycov):
  --p-query-cov=$pquerycov
 #end if
 
@@ -35,18 +35,29 @@
  --p-strand=$pstrand
 #end if
 
-#if $pevalue:
+#if str($pevalue):
  --p-evalue=$pevalue
 #end if
 
-#if $pminconsensus:
+#if str($pminconsensus):
  --p-min-consensus=$pminconsensus
 #end if
 
+
+
+
+
+#if '__sq__' in str($punassignablelabel):
+  #set $punassignablelabel_temp = $punassignablelabel.replace('__sq__', "'")
+  #set $punassignablelabel = $punassignablelabel_temp
+#end if
+
 #if str($punassignablelabel):
  --p-unassignable-label="$punassignablelabel"
 #end if
 
+
+
 --o-classification=oclassification
 ;
 cp oclassification.qza $oclassification
@@ -81,7 +92,7 @@
 		</param>
 		<param label="--p-evalue: NUMBER       BLAST expectation value (E) threshold for saving hits.                               [default: 0.001]" name="pevalue" optional="True" type="float" value="0.001"/>
 		<param label="--p-min-consensus: NUMBER Range(0.5, 1.0, inclusive_start=False, inclusive_end=True)   Minimum fraction of assignments must match top hit to be accepted as consensus assignment. Must be in range (0.5, 1.0].                    [default: 0.51]" name="pminconsensus" optional="True" type="float" min="0.5" max="1" exclude_min="True" exclude_max="False" value="0.51"/>
-		<param label="--p-unassignable-label: TEXT [default: 'Unassigned']" name="punassignablelabel" optional="True" type="text" value="'Unassigned'"/>
+		<param label="--p-unassignable-label: TEXT [default: 'Unassigned']" name="punassignablelabel" optional="True" type="text" value="Unassigned"/>
 	</inputs>
 	<outputs>
 		<data format="qza" label="${tool.name} on ${on_string}: classification.qza" name="oclassification"/>