diff --git a/lib/isodoc/csa/csa.standard.xsl b/lib/isodoc/csa/csa.standard.xsl
index 8d19754..a21f1cf 100644
--- a/lib/isodoc/csa/csa.standard.xsl
+++ b/lib/isodoc/csa/csa.standard.xsl
@@ -6492,6 +6492,8 @@
 	<!-- ======================================= -->
 	<!-- math -->
 	<!-- ======================================= -->
+	<xsl:template match="*[local-name() = 'stem'][following-sibling::*[1][local-name() = 'fmt-stem']]"/> <!-- for tablesonly.xml generated by mn2pdf -->
+
 	<xsl:template match="mathml:math">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -8324,7 +8326,9 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'title' or local-name() = 'name' or local-name() = 'fmt-title' or local-name() = 'fmt-name']//*[local-name() = 'stem']" mode="contents">
+	<xsl:template match="*[local-name() = 'stem']" mode="contents"/>
+
+	<xsl:template match="*[local-name() = 'title' or local-name() = 'name' or local-name() = 'fmt-title' or local-name() = 'fmt-name']//*[local-name() = 'fmt-stem']" mode="contents">
 		<xsl:apply-templates select="."/>
 	</xsl:template>
 
@@ -8341,7 +8345,8 @@
 		<xsl:apply-templates mode="contents"/>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+	<xsl:template match="*[local-name() = 'stem']" mode="bookmarks"/>
+	<xsl:template match="*[local-name() = 'fmt-stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template>
 
@@ -8757,7 +8762,8 @@
 		</xsl:copy>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'stem']" mode="contents_item">
+	<xsl:template match="*[local-name() = 'stem']" mode="contents_item"/>
+	<xsl:template match="*[local-name() = 'fmt-stem']" mode="contents_item">
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
@@ -11761,7 +11767,37 @@
 	<xsl:template match="*[local-name() = 'preprocess-xslt']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'preprocess-xslt']" mode="update_xml_pres"/>
 
-	<xsl:template match="*[local-name() = 'stem'][not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])] |        *[local-name() = 'image'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'sourcecode'][not(.//*[local-name() = 'passthrough']) and not(.//*[local-name() = 'fmt-name'])] |        *[local-name() = 'bibdata'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'localized-strings']" mode="update_xml_step1">
+	<xsl:template match="*[local-name() = 'stem']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'stem']" mode="update_xml_pres"/>
+
+	<xsl:template match="*[local-name() = 'fmt-stem'][not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])]" mode="update_xml_step1">
+		<xsl:element name="stem" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:choose>
+				<xsl:when test="*[local-name() = 'semx'] and count(node()) = 1">
+					<xsl:copy-of select="*[local-name() = 'semx']/node()"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="node()"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-stem'][not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])]" mode="update_xml_pres">
+		<xsl:element name="stem" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:choose>
+				<xsl:when test="*[local-name() = 'semx'] and count(node()) = 1">
+					<xsl:copy-of select="*[local-name() = 'semx']/node()"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="node()"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'image'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'sourcecode'][not(.//*[local-name() = 'passthrough']) and not(.//*[local-name() = 'fmt-name'])] |        *[local-name() = 'bibdata'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'localized-strings']" mode="update_xml_step1">
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
@@ -13198,9 +13234,9 @@
 				<xsl:value-of select="document('')//*/namespace::csa"/>
 
 		</xsl:variable>
-		<xsl:if test="$documentNS != $XSLNS">
+		<!-- <xsl:if test="$documentNS != $XSLNS">
 			<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
-		</xsl:if>
+		</xsl:if> -->
 	</xsl:template> <!-- namespaceCheck -->
 
 	<xsl:template name="getLanguage">
@@ -13279,10 +13315,10 @@
 
 		<xsl:variable name="data_value">
 			<xsl:choose>
-				<xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
+				<xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != 0">
 					<xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
 				</xsl:when>
-				<xsl:when test="string-length($bibdata_updated) != ''">
+				<xsl:when test="string-length($bibdata_updated) != 0">
 					<xsl:value-of select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
 				</xsl:when>
 				<xsl:when test="$formatted = 'true'">