diff --git a/test/test_metadata_article_Datacite.py b/test/test_metadata_article_Datacite.py
index 2dcdf9b7..5d6583b2 100644
--- a/test/test_metadata_article_Datacite.py
+++ b/test/test_metadata_article_Datacite.py
@@ -33,11 +33,11 @@ def test_similarity(self):
 
         transform = ET.XSLT(xslt)  # is it a reserved word
         newdom = transform(dom)
-        print(newdom)
+
         real_string = ET.tostring(newdom, pretty_print=True, encoding='utf8').decode()
         # test if result is parsable
         reference = ET.parse(r'test/data/articles/Test_Reference-Datacite.xml')
-        print(reference)
+
         expected_string = ET.tostring(reference, pretty_print=True, encoding='utf8').decode()
         diff = main.diff_texts(expected_string, real_string, {
             'ratio_mode': 'fast',  # is that for latency
diff --git a/xslt/articles/xslt-article-Datacite.xslt b/xslt/articles/xslt-article-Datacite.xslt
index 92b4f17f..a6a49016 100644
--- a/xslt/articles/xslt-article-Datacite.xslt
+++ b/xslt/articles/xslt-article-Datacite.xslt
@@ -96,43 +96,85 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
     </xsl:template>
 
     <!-- Template for processing authors -->
-    <xsl:template match="authors">
-        <creator>
-            <creatorName nameType="Personal">
-                <xsl:value-of select="name"/>
-            </creatorName>
-            <givenName>
-                <xsl:value-of select="substring-before(name, ',')"/>
-            </givenName>
-            <familyName>
-                <xsl:value-of select="substring-after(name, ', ')"/>
-            </familyName>
-            <nameIdentifier schemeURI="https://zbmath.org/" nameIdentifierScheme="zbMATH Author Code">
-                <xsl:value-of select="codes"/>
-            </nameIdentifier>
-        </creator>
-    </xsl:template>
+  <xsl:template match="authors">
+    <creator>
+        <creatorName nameType="Personal">
+            <xsl:choose>
+                <xsl:when test="normalize-space(name) = '' or name = 'None' or name = 'none'">:unav</xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="normalize-space(name)"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </creatorName>
+
+        <givenName>
+            <xsl:choose>
+                <xsl:when test="normalize-space(name) = '' or name = 'None' or name = 'none'">:unav</xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="normalize-space(substring-before(name, ','))"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </givenName>
+
+        <familyName>
+            <xsl:choose>
+                <xsl:when test="normalize-space(name) = '' or name = 'None' or name = 'none'">:unav</xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="normalize-space(substring-after(name, ', '))"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </familyName>
+
+        <nameIdentifier schemeURI="https://zbmath.org/" nameIdentifierScheme="zbMATH Author Code">
+            <xsl:choose>
+                <xsl:when test="normalize-space(codes) = '' or codes = 'None' or codes = 'none'">:unav</xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="normalize-space(codes)"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </nameIdentifier>
+    </creator>
+</xsl:template>
+
+
     <!-- Template for processing titles -->
-        <xsl:template match="title">
-            <!-- Transform titles into structured titles -->
-        <titles>
-            <title xml:lang="en">
-                <xsl:value-of select="title"/>
-            </title>
-        </titles>
-           </xsl:template>
-     <!-- Template for processing publisher -->
-            <xsl:template match="publisher">
-            <publisher xml:lang="en">
-            <xsl:value-of select="."/>
-            </publisher>
-            </xsl:template>
-    <!-- Template for processing publication year -->
-          <xsl:template match="year">
-            <publicationYear>
-             <xsl:value-of select="."/>
-            </publicationYear>
-            </xsl:template>
+    <xsl:template match="title">
+    <titles>
+        <title xml:lang="en">
+            <xsl:choose>
+                <xsl:when test="normalize-space(.) = '' or . = 'None' or . = 'none'">:unkn</xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="normalize-space(.)"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </title>
+    </titles>
+</xsl:template>
+
+
+<xsl:template match="publisher">
+    <publisher xml:lang="en">
+        <xsl:choose>
+            <xsl:when test="normalize-space(.) = '' or . = 'None' or . = 'none'">:unav</xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="."/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </publisher>
+</xsl:template>
+
+<xsl:template match="year">
+    <publicationYear>
+        <xsl:choose>
+            <xsl:when test="normalize-space(.) = '' or . = 'None' or . = 'none'">:unav</xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="."/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </publicationYear>
+</xsl:template>
+
+
     <!-- Template for processing the language of the document -->
       <xsl:template match="languages">
            <xsl:if test="normalize-space(.) != '' and . != 'None'and . != 'none'">