diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Complete.jrxml
index 15447f04..c10f35bc 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Complete.jrxml
@@ -74,7 +74,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Complete_INTERIM.jrxml
index 6cf3a1f2..39084ebc 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Complete_INTERIM.jrxml
@@ -80,7 +80,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Incomplete.jrxml
index 026bf49e..245f8923 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Incomplete.jrxml
@@ -84,7 +84,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Incomplete_INTERIM.jrxml
index 23e011de..b5e54df8 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-IND/BG_BC1950-IND_Incomplete_INTERIM.jrxml
@@ -90,7 +90,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Complete.jrxml
index e8094fc1..502eac90 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Complete.jrxml
@@ -75,7 +75,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Complete_INTERIM.jrxml
index 5bf08610..2c2ef6d5 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Complete_INTERIM.jrxml
@@ -81,7 +81,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Incomplete.jrxml
index 026bf49e..245f8923 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Incomplete.jrxml
@@ -84,7 +84,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Incomplete_INTERIM.jrxml
index 23e011de..b5e54df8 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1950-PUB/BG_BC1950-PUB_Incomplete_INTERIM.jrxml
@@ -90,7 +90,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1986-IND/BG_BC1986-IND.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1986-IND/BG_BC1986-IND.jrxml
index 33f5d6ae..6ac73086 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1986-IND/BG_BC1986-IND.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1986-IND/BG_BC1986-IND.jrxml
@@ -209,7 +209,7 @@ GRADE]]></text>
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" isRemoveLineWhenBlank="true" uuid="81cc511a-0e3d-4087-9021-b8e648ce1f5c">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1986-IND/BG_BC1986-IND_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1986-IND/BG_BC1986-IND_INTERIM.jrxml
index 51dc7893..7fac36a7 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1986-IND/BG_BC1986-IND_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1986-IND/BG_BC1986-IND_INTERIM.jrxml
@@ -223,7 +223,7 @@ GRADE]]></text>
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" isRemoveLineWhenBlank="true" uuid="81cc511a-0e3d-4087-9021-b8e648ce1f5c">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1986-PUB/BG_BC1986-PUB.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1986-PUB/BG_BC1986-PUB.jrxml
index 77907253..3b1b75e1 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1986-PUB/BG_BC1986-PUB.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1986-PUB/BG_BC1986-PUB.jrxml
@@ -209,7 +209,7 @@ GRADE]]></text>
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" isRemoveLineWhenBlank="true" uuid="81cc511a-0e3d-4087-9021-b8e648ce1f5c">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1986-PUB/BG_BC1986-PUB_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1986-PUB/BG_BC1986-PUB_INTERIM.jrxml
index 8bf40e72..1d652f58 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1986-PUB/BG_BC1986-PUB_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1986-PUB/BG_BC1986-PUB_INTERIM.jrxml
@@ -223,7 +223,7 @@ GRADE]]></text>
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" isRemoveLineWhenBlank="true" uuid="81cc511a-0e3d-4087-9021-b8e648ce1f5c">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Complete.jrxml
index 75a8d019..d10f2e86 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Complete.jrxml
@@ -74,7 +74,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Complete_INTERIM.jrxml
index 967376ea..c689cef3 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Complete_INTERIM.jrxml
@@ -80,7 +80,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Incomplete.jrxml
index a6052ac1..b1ffb62a 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Incomplete.jrxml
@@ -84,7 +84,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="96" uuid="d31b893a-531a-4852-83a0-9c74cdf72824">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Incomplete_INTERIM.jrxml
index 9ddff466..53a5e813 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-IND/BG_BC1996-IND_Incomplete_INTERIM.jrxml
@@ -90,7 +90,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="566" height="96" uuid="d31b893a-531a-4852-83a0-9c74cdf72824">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Complete.jrxml
index 75a8d019..d10f2e86 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Complete.jrxml
@@ -74,7 +74,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Complete_INTERIM.jrxml
index 6cf3a1f2..39084ebc 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Complete_INTERIM.jrxml
@@ -80,7 +80,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Incomplete.jrxml
index f346c38f..1dea8aaa 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Incomplete.jrxml
@@ -84,7 +84,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Incomplete_INTERIM.jrxml
index 88b3d695..f4a3a2f1 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC1996-PUB/BG_BC1996-PUB_Incomplete_INTERIM.jrxml
@@ -90,7 +90,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Complete.jrxml
index 75a8d019..d10f2e86 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Complete.jrxml
@@ -74,7 +74,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Complete_INTERIM.jrxml
index 6cf3a1f2..39084ebc 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Complete_INTERIM.jrxml
@@ -80,7 +80,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Incomplete.jrxml
index f346c38f..1dea8aaa 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Incomplete.jrxml
@@ -84,7 +84,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Incomplete_INTERIM.jrxml
index 88b3d695..f4a3a2f1 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-IND/BG_BC2004-IND_Incomplete_INTERIM.jrxml
@@ -90,7 +90,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Complete.jrxml
index 75a8d019..d10f2e86 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Complete.jrxml
@@ -74,7 +74,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Complete_INTERIM.jrxml
index 6cf3a1f2..39084ebc 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Complete_INTERIM.jrxml
@@ -80,7 +80,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Incomplete.jrxml
index f346c38f..1dea8aaa 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Incomplete.jrxml
@@ -84,7 +84,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Incomplete_INTERIM.jrxml
index bdd5a46f..b58068ca 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2004-PUB/BG_BC2004-PUB_Incomplete_INTERIM.jrxml
@@ -90,7 +90,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Complete.jrxml
index 75a8d019..d10f2e86 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Complete.jrxml
@@ -74,7 +74,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Complete_INTERIM.jrxml
index 6cf3a1f2..39084ebc 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Complete_INTERIM.jrxml
@@ -80,7 +80,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Incomplete.jrxml
index f346c38f..1dea8aaa 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Incomplete.jrxml
@@ -84,7 +84,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Incomplete_INTERIM.jrxml
index 88b3d695..f4a3a2f1 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-IND/BG_BC2018-IND_Incomplete_INTERIM.jrxml
@@ -90,7 +90,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Complete.jrxml
index 82aea880..6529dd24 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Complete.jrxml
@@ -75,7 +75,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Complete_INTERIM.jrxml
index 5bf08610..2c2ef6d5 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Complete_INTERIM.jrxml
@@ -81,7 +81,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Incomplete.jrxml
index bd9da9df..f26de212 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Incomplete.jrxml
@@ -85,7 +85,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Incomplete_INTERIM.jrxml
index 1511a226..1bb54560 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-OFF/BG_BC2018-OFF_Incomplete_INTERIM.jrxml
@@ -91,7 +91,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Complete.jrxml
index 82aea880..6529dd24 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Complete.jrxml
@@ -75,7 +75,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Complete_INTERIM.jrxml
index 5bf08610..2c2ef6d5 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Complete_INTERIM.jrxml
@@ -81,7 +81,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Incomplete.jrxml
index bd9da9df..f26de212 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Incomplete.jrxml
@@ -85,7 +85,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Incomplete_INTERIM.jrxml
index 1511a226..1bb54560 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PF/BG_BC2018-PF_Incomplete_INTERIM.jrxml
@@ -91,7 +91,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Complete.jrxml
index 82aea880..6529dd24 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Complete.jrxml
@@ -75,7 +75,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Complete_INTERIM.jrxml
index 5bf08610..2c2ef6d5 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Complete_INTERIM.jrxml
@@ -81,7 +81,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Incomplete.jrxml
index bd9da9df..f26de212 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Incomplete.jrxml
@@ -85,7 +85,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Incomplete_INTERIM.jrxml
index 1511a226..1bb54560 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2018-PUB/BG_BC2018-PUB_Incomplete_INTERIM.jrxml
@@ -91,7 +91,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Complete.jrxml
index 75a8d019..d10f2e86 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Complete.jrxml
@@ -74,7 +74,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Complete_INTERIM.jrxml
index 6cf3a1f2..39084ebc 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Complete_INTERIM.jrxml
@@ -80,7 +80,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Incomplete.jrxml
index f346c38f..1dea8aaa 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Incomplete.jrxml
@@ -84,7 +84,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Incomplete_INTERIM.jrxml
index 88b3d695..f4a3a2f1 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-IND/BG_BC2023-IND_Incomplete_INTERIM.jrxml
@@ -90,7 +90,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Complete.jrxml
index 82aea880..6529dd24 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Complete.jrxml
@@ -75,7 +75,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Complete_INTERIM.jrxml
index 5bf08610..2c2ef6d5 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Complete_INTERIM.jrxml
@@ -81,7 +81,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Incomplete.jrxml
index bd9da9df..f26de212 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Incomplete.jrxml
@@ -85,7 +85,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Incomplete_INTERIM.jrxml
index 1511a226..1bb54560 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-OFF/BG_BC2023-OFF_Incomplete_INTERIM.jrxml
@@ -91,7 +91,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Complete.jrxml
index 82aea880..6529dd24 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Complete.jrxml
@@ -75,7 +75,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Complete_INTERIM.jrxml
index 5bf08610..2c2ef6d5 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Complete_INTERIM.jrxml
@@ -81,7 +81,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Incomplete.jrxml
index bd9da9df..f26de212 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Incomplete.jrxml
@@ -85,7 +85,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Incomplete_INTERIM.jrxml
index 1511a226..1bb54560 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PF/BG_BC2023-PF_Incomplete_INTERIM.jrxml
@@ -91,7 +91,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Complete.jrxml
index 82aea880..6529dd24 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Complete.jrxml
@@ -75,7 +75,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Complete_INTERIM.jrxml
index 5bf08610..2c2ef6d5 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Complete_INTERIM.jrxml
@@ -81,7 +81,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Incomplete.jrxml
index bd9da9df..f26de212 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Incomplete.jrxml
@@ -85,7 +85,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Incomplete_INTERIM.jrxml
index 1511a226..1bb54560 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/BC2023-PUB/BG_BC2023-PUB_Incomplete_INTERIM.jrxml
@@ -91,7 +91,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Complete.jrxml
index 82aea880..6529dd24 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Complete.jrxml
@@ -75,7 +75,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Complete_INTERIM.jrxml
index 5bf08610..2c2ef6d5 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Complete_INTERIM.jrxml
@@ -81,7 +81,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Incomplete.jrxml
index 283c82e7..38cc10db 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Incomplete.jrxml
@@ -85,7 +85,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Incomplete_INTERIM.jrxml
index bc229946..9f6b846b 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/NOPROG/BG_NOPROG_Incomplete_INTERIM.jrxml
@@ -91,7 +91,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Complete.jrxml
index 760834e1..da49c238 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Complete.jrxml
@@ -85,7 +85,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="78" uuid="d31b893a-531a-4852-83a0-9c74cdf72824">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Complete_INTERIM.jrxml
index 003b54ec..d0c2fcb8 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Complete_INTERIM.jrxml
@@ -91,7 +91,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="78" uuid="d31b893a-531a-4852-83a0-9c74cdf72824">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Incomplete.jrxml
index b44907a2..01411d17 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Incomplete.jrxml
@@ -84,7 +84,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Incomplete_INTERIM.jrxml
index 97ebb49e..c88bfcb1 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-EN/BG_SCCP-EN_Incomplete_INTERIM.jrxml
@@ -90,7 +90,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Complete.jrxml
index 12e820f2..b8d013ad 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Complete.jrxml
@@ -82,7 +82,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="79" uuid="d31b893a-531a-4852-83a0-9c74cdf72824">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Complete_INTERIM.jrxml
index 99eb7c2b..34d2ea4a 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Complete_INTERIM.jrxml
@@ -89,7 +89,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="78" uuid="d31b893a-531a-4852-83a0-9c74cdf72824">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Incomplete.jrxml
index b44907a2..01411d17 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Incomplete.jrxml
@@ -84,7 +84,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Incomplete_INTERIM.jrxml
index 97ebb49e..c88bfcb1 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/SCCP-FR/BG_SCCP-FR_Incomplete_INTERIM.jrxml
@@ -90,7 +90,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Complete.jrxml
index e8094fc1..502eac90 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Complete.jrxml
@@ -75,7 +75,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Complete_INTERIM.jrxml
index 5bf08610..2c2ef6d5 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Complete_INTERIM.jrxml
@@ -81,7 +81,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Incomplete.jrxml
index b9b485e3..6417d278 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Incomplete.jrxml
@@ -84,7 +84,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Incomplete_INTERIM.jrxml
index 54a7dc28..15df431b 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU1950-PUB/BG_YU1950-PUB_Incomplete_INTERIM.jrxml
@@ -90,7 +90,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU1986-PUB/BG_YU1986-PUB.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU1986-PUB/BG_YU1986-PUB.jrxml
index 97d93116..61ec0a41 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU1986-PUB/BG_YU1986-PUB.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU1986-PUB/BG_YU1986-PUB.jrxml
@@ -209,7 +209,7 @@ GRADE]]></text>
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="58" isRemoveLineWhenBlank="true" uuid="81cc511a-0e3d-4087-9021-b8e648ce1f5c">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU1986-PUB/BG_YU1986-PUB_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU1986-PUB/BG_YU1986-PUB_INTERIM.jrxml
index 8bf40e72..1d652f58 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU1986-PUB/BG_YU1986-PUB_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU1986-PUB/BG_YU1986-PUB_INTERIM.jrxml
@@ -223,7 +223,7 @@ GRADE]]></text>
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" isRemoveLineWhenBlank="true" uuid="81cc511a-0e3d-4087-9021-b8e648ce1f5c">
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Complete.jrxml
index 75a8d019..d10f2e86 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Complete.jrxml
@@ -74,7 +74,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Complete_INTERIM.jrxml
index 6cf3a1f2..39084ebc 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Complete_INTERIM.jrxml
@@ -80,7 +80,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Incomplete.jrxml
index f346c38f..1dea8aaa 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Incomplete.jrxml
@@ -84,7 +84,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Incomplete_INTERIM.jrxml
index 88b3d695..f4a3a2f1 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU1996-PUB/BG_YU1996-PUB_Incomplete_INTERIM.jrxml
@@ -90,7 +90,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Complete.jrxml
index 75a8d019..d10f2e86 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Complete.jrxml
@@ -74,7 +74,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Complete_INTERIM.jrxml
index 6cf3a1f2..39084ebc 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Complete_INTERIM.jrxml
@@ -80,7 +80,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Incomplete.jrxml
index f346c38f..1dea8aaa 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Incomplete.jrxml
@@ -84,7 +84,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Incomplete_INTERIM.jrxml
index 88b3d695..f4a3a2f1 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU2004-PUB/BG_YU2004-PUB_Incomplete_INTERIM.jrxml
@@ -90,7 +90,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Complete.jrxml
index 82aea880..6529dd24 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Complete.jrxml
@@ -75,7 +75,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Complete_INTERIM.jrxml
index 5bf08610..2c2ef6d5 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Complete_INTERIM.jrxml
@@ -81,7 +81,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Incomplete.jrxml
index bd9da9df..f26de212 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Incomplete.jrxml
@@ -85,7 +85,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Incomplete_INTERIM.jrxml
index 1511a226..1bb54560 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU2018-PUB/BG_YU2018-PUB_Incomplete_INTERIM.jrxml
@@ -91,7 +91,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Complete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Complete.jrxml
index 82aea880..6529dd24 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Complete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Complete.jrxml
@@ -75,7 +75,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Complete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Complete_INTERIM.jrxml
index 5bf08610..2c2ef6d5 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Complete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Complete_INTERIM.jrxml
@@ -81,7 +81,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" x="0" y="12" width="567" height="74" uuid="d2fa32c9-111c-4826-9805-a1e7e3ff21d1"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Incomplete.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Incomplete.jrxml
index bd9da9df..f26de212 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Incomplete.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Incomplete.jrxml
@@ -85,7 +85,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>
diff --git a/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Incomplete_INTERIM.jrxml b/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Incomplete_INTERIM.jrxml
index 1511a226..1bb54560 100644
--- a/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Incomplete_INTERIM.jrxml
+++ b/api/src/main/resources/reports/subreports/transcript/sections/YU2023-PUB/BG_YU2023-PUB_Incomplete_INTERIM.jrxml
@@ -91,7 +91,7 @@
 						<bottomPen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Left"/>
-					<textFieldExpression><![CDATA[$R{text.header.separator.completion}.toUpperCase() + ($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note} : "")]]></textFieldExpression>
+					<textFieldExpression><![CDATA[($P{P_REPORT_PREVIEW} ? $R{text.header.separator.completion.xml.note}.toUpperCase() : $R{text.header.separator.completion}.toUpperCase())]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="ScaleFont" isBlankWhenNull="true">
 					<reportElement style="GraduationStatus" mode="Transparent" x="0" y="12" width="567" height="84" uuid="d31b893a-531a-4852-83a0-9c74cdf72824"/>