diff --git a/format-master.xml b/format-master.xml
index ef2a7a5..4d1c25c 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -5,12 +5,11 @@
 >
 
 	<template name="PaperCode" match="PaperCode">
-		<latex><xsl:value-of select="$department"/>~<xsl:value-of select="$paper"/></latex>
-		<html>
+		<common>
 			<xsl:value-of select="$department"/>
-			<xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
+			<xsl:text> </xsl:text>
 			<xsl:value-of select="$paper"/>
-		</html>
+		</common>
 	</template>
 
 	<template name="OracleServer" match="OracleServer">
@@ -1905,6 +1904,7 @@
 	-->
 	<template name="paper" match="paper">
 		<common>
+			<xsl:text> </xsl:text>
 			<xsl:apply-templates select="subject-code"/>
 			<xsl:text> </xsl:text>
 			<xsl:apply-templates select="paper-number"/>
