diff --git a/test/data/software/OpenAire-software-reference.xml b/test/data/software/OpenAire-software-reference.xml
index 65d58af..e9621c2 100644
--- a/test/data/software/OpenAire-software-reference.xml
+++ b/test/data/software/OpenAire-software-reference.xml
@@ -173,4 +173,5 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
    <dc:language>eng</dc:language>
    <dc:source>zbMATH Open Web Interface contents unavailable due to conflicting licenses.</dc:source>
    <oaire:citationTitle>zbMATH Open Web Interface contents unavailable due to conflicting licenses.</oaire:citationTitle>
+   <datacite:date dateType="Issued">2003</datacite:date>
 </resource>
diff --git a/xslt/software/xslt-software-OpenAire.xslt b/xslt/software/xslt-software-OpenAire.xslt
index 2abfbe9..41ba375 100644
--- a/xslt/software/xslt-software-OpenAire.xslt
+++ b/xslt/software/xslt-software-OpenAire.xslt
@@ -25,10 +25,12 @@
                  </datacite:titles>
                 <xsl:apply-templates select="root/description"/>
 
-           <datacite:subjects>
-                <xsl:apply-templates select="root/classification"/>
-                <xsl:apply-templates select="root/keywords"/>
-            </datacite:subjects>
+              <xsl:if test="root/classification[normalize-space(.) != '' and . != 'None'] or root/keywords[normalize-space(.) != '' and . != 'None']">
+        <datacite:subjects>
+            <xsl:apply-templates select="root/classification"/>
+            <xsl:apply-templates select="root/keywords"/>
+        </datacite:subjects>
+           </xsl:if>
 
              <datacite:relatedIdentifiers>
                 <xsl:apply-templates select="root/standard_articles/id"/>
@@ -58,6 +60,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
            <dc:language>eng</dc:language>
            <xsl:apply-templates select="root/standard_articles/source"/>
            <xsl:apply-templates select="root/standard_articles/title"/>
+           <xsl:apply-templates select="root/standard_articles/year"/>
 
   </resource>
 
@@ -110,7 +113,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
           <xsl:if test="normalize-space(.) != '' and . != 'None'">
         <datacite:subject subjectScheme="msc2020" >
             <xsl:value-of select="."/>
-        </datacite:subject>
+              </datacite:subject>
           </xsl:if>
         </xsl:template>
 
@@ -126,9 +129,11 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
 
 
  <xsl:template match="source">
+     <xsl:if test="normalize-space(.) != '' and . != 'None'">
     <dc:source>
     <xsl:value-of select="."/>
     </dc:source>
+     </xsl:if>
     </xsl:template>
 
      <xsl:template match="title">
@@ -155,5 +160,13 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
     </xsl:if>
 </xsl:template>
 
+     <xsl:template match="year">
+          <xsl:if test="normalize-space(.) != '' and . != 'None'">
+      <datacite:date dateType="Issued">
+          <xsl:value-of select="."/>
+      </datacite:date>
+         </xsl:if>
+    </xsl:template>
+
 
 </xsl:stylesheet>
\ No newline at end of file