diff --git a/test/data/software/OpenAire-software-reference.xml b/test/data/software/OpenAire-software-reference.xml
index 32e6a0d1..cd3f9b55 100644
--- a/test/data/software/OpenAire-software-reference.xml
+++ b/test/data/software/OpenAire-software-reference.xml
@@ -22,7 +22,6 @@
    <datacite:titles>
       <datacite:title>SuperLU-DIST</datacite:title>
    </datacite:titles>
-   <dc:description xml:lang="en" descriptionType="Abstract">zbMATH Open Web Interface contents unavailable due to conflicting licenses.</dc:description>
    <datacite:subjects>
       <datacite:subject subjectScheme="msc2020">35</datacite:subject>
       <datacite:subject subjectScheme="msc2020">65</datacite:subject>
@@ -173,7 +172,5 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
    </datacite:rightsList>
    <dc:format>application/xml</dc:format>
    <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/articles/xslt-article-Datacite.xslt b/xslt/articles/xslt-article-Datacite.xslt
index 13f3a490..651a229e 100644
--- a/xslt/articles/xslt-article-Datacite.xslt
+++ b/xslt/articles/xslt-article-Datacite.xslt
@@ -94,21 +94,21 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
     </xsl:template>
     <!-- Template for processing the rest of the  identifiers of our Metadata and considered as alternative identifiers-->
     <xsl:template match="identifier">
-        <xsl:if test="normalize-space(.) != '' and . != 'None'and . != 'none'">
+        <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none'">
             <alternateIdentifier alternateIdentifierType="zbMATH Identifier">
                 <xsl:value-of select="."/>
             </alternateIdentifier>
         </xsl:if>
     </xsl:template>
     <xsl:template match="id">
-        <xsl:if test="normalize-space(.) != '' and . != 'None'and . != 'none'">
+        <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none'">
             <alternateIdentifier alternateIdentifierType="zbMATH Document ID">
                 <xsl:value-of select="."/>
             </alternateIdentifier>
         </xsl:if>
     </xsl:template>
     <xsl:template match="zbmath_url">
-        <xsl:if test="normalize-space(.) != '' and . != 'None'and . != 'none'">
+        <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none'">
             <alternateIdentifier alternateIdentifierType="URL">
                 <xsl:value-of select="."/>
             </alternateIdentifier>
@@ -223,7 +223,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
                     <xsl:attribute name="resourceTypeGeneral">Book</xsl:attribute>
                 </xsl:when>
                 <xsl:otherwise>
-                    <xsl:attribute name="resourceTypeGeneral">Other</xsl:attribute>
+                    <xsl:attribute name="resourceTypeGeneral">:none</xsl:attribute>
                 </xsl:otherwise>
             </xsl:choose>
             <xsl:value-of select="."/>
@@ -323,7 +323,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
     <!-- Template for processing MSC  (Mathematics Subject Classification)
      transforming all its values -->
     <xsl:template match="msc">
-        <xsl:if test="normalize-space(.) != '' and . != 'None'and . != 'none'">
+        <xsl:if test="normalize-space(.) != '' and . != 'None'and . != 'none' and not(contains(., 'zbMATH Open Web Interface contents unavailable due to conflicting licenses'))">
             <subject>
                 <xsl:attribute name="subjectScheme">
                     <xsl:value-of select="scheme"/>
@@ -338,7 +338,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
 
 
     <xsl:template match="keywords">
-        <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none'">
+        <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none' and not(contains(., 'zbMATH Open Web Interface contents unavailable due to conflicting licenses'))">
 
             <subject subjectScheme="keyword">
                 <xsl:value-of select="."/>
diff --git a/xslt/articles/xslt-article-OpenAire2.xslt b/xslt/articles/xslt-article-OpenAire2.xslt
index ae0192fb..bcfafe0e 100644
--- a/xslt/articles/xslt-article-OpenAire2.xslt
+++ b/xslt/articles/xslt-article-OpenAire2.xslt
@@ -121,7 +121,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
     </xsl:template>
 
      <xsl:template match="root/links">
-         <xsl:if test="normalize-space(.) != '' and . != 'None'and . != 'none'">
+         <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none'">
     <xsl:choose>
         <!-- Process the first 'links' node that has a 'doi' identifier -->
         <xsl:when test="self::links[type = 'doi' and normalize-space(identifier) != ''][1]">
@@ -177,7 +177,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
            </xsl:template>
 
      <xsl:template match="text">
-            <xsl:if test="normalize-space(.) != '' and . != 'None'and . != 'none'">
+            <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none'">
         <dc:description  descriptionType="Abstract">
 
          <xsl:value-of select="normalize-space(.)"/>
@@ -185,8 +185,9 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
         </dc:description>
             </xsl:if>
         </xsl:template>
+
    <xsl:template match="msc">
-       <xsl:if test="normalize-space(.) != '' and . != 'None'and . != 'none'">
+       <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none' and not(contains(., 'zbMATH Open Web Interface contents unavailable due to conflicting licenses'))">
     <datacite:subject>
         <xsl:attribute name="subjectScheme">
             <xsl:value-of select="scheme"/>
@@ -200,7 +201,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
 </xsl:template>
 
        <xsl:template match="keywords">
-            <xsl:if test="normalize-space(.) != '' and . != 'None'and . != 'none'">
+            <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none' and not(contains(., 'zbMATH Open Web Interface contents unavailable due to conflicting licenses'))">
         <datacite:subject subjectScheme="keyword">
             <xsl:value-of select="."/>
         </datacite:subject>
@@ -235,7 +236,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
 
 
             <xsl:template match="publisher">
-                 <xsl:if test="normalize-space(.) != '' and . != 'None'and . != 'none'">
+                 <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none'">
             <dc:publisher>
             <xsl:value-of select="."/>
             </dc:publisher>
diff --git a/xslt/software/xslt-software-OpenAire.xslt b/xslt/software/xslt-software-OpenAire.xslt
index bb5d4a94..72a3b3ea 100644
--- a/xslt/software/xslt-software-OpenAire.xslt
+++ b/xslt/software/xslt-software-OpenAire.xslt
@@ -135,7 +135,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
     </xsl:template>
 
     <xsl:template match="license_terms">
-        <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none'">
+        <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none' and not(contains(., 'zbMATH Open Web Interface contents unavailable due to conflicting licenses'))">
 <oaire:licenseCondition>
     <xsl:value-of select="."/>
 </oaire:licenseCondition>
@@ -143,7 +143,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
     </xsl:template>
 
      <xsl:template match="description">
-        <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none'">
+        <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none' and not(contains(., 'zbMATH Open Web Interface contents unavailable due to conflicting licenses'))">
         <dc:description xml:lang="en" descriptionType="Abstract">
          <xsl:value-of select="."/>
         </dc:description>
@@ -151,7 +151,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
         </xsl:template>
 
       <xsl:template match="classification">
-          <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none'">
+          <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none' and not(contains(., 'zbMATH Open Web Interface contents unavailable due to conflicting licenses'))">
         <datacite:subject subjectScheme="msc2020" >
             <xsl:value-of select="."/>
         </datacite:subject>
@@ -159,7 +159,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
         </xsl:template>
 
         <xsl:template match="keywords">
-            <xsl:if test="normalize-space(.) != '' and . != 'None'and . != 'none'">
+            <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none' and not(contains(., 'zbMATH Open Web Interface contents unavailable due to conflicting licenses'))">
             <!-- Transformation of  keywords -->
         <datacite:subject subjectScheme="keyword">
             <xsl:value-of select="."/>
@@ -170,7 +170,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
 
 
  <xsl:template match="source">
-     <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none'">
+     <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none' and not(contains(., 'zbMATH Open Web Interface contents unavailable due to conflicting licenses'))">
     <dc:source>
     <xsl:value-of select="."/>
     </dc:source>
@@ -178,7 +178,7 @@ Content generated by zbMATH Open, such as reviews, classifications, software, or
     </xsl:template>
 
      <xsl:template match="title">
-          <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none'">
+          <xsl:if test="normalize-space(.) != '' and . != 'None' and . != 'none' and not(contains(., 'zbMATH Open Web Interface contents unavailable due to conflicting licenses'))">
     <oaire:citationTitle>
     <xsl:value-of select="."/>
     </oaire:citationTitle>
diff --git a/xslt/software/xslt-software-datacite.xslt b/xslt/software/xslt-software-datacite.xslt
index d35d18bb..a90d53c3 100644
--- a/xslt/software/xslt-software-datacite.xslt
+++ b/xslt/software/xslt-software-datacite.xslt
@@ -216,11 +216,17 @@
     </xsl:if>
 </xsl:template>
 
-     <xsl:template match="homepage">
-        <relatedIdentifier  relatedIdentifierType="URL" relationType="IsSourceOf">
+    <xsl:template match="homepage">
+    <xsl:if test="normalize-space(.) != ''
+                  and normalize-space(.) != 'none'
+                  and normalize-space(.) != 'None'
+                  and not(contains(., 'zbMATH Open Web Interface contents unavailable due to conflicting licenses'))">
+        <relatedIdentifier relatedIdentifierType="URL" relationType="IsSourceOf">
             <xsl:value-of select="."/>
         </relatedIdentifier>
-        </xsl:template>
+    </xsl:if>
+    </xsl:template>
+
 
     <!-- Template to get the source code -->
 <xsl:template name="sourceCode">
@@ -238,19 +244,30 @@
 
 
      <xsl:template match="references">
+         <xsl:if test="normalize-space(.) != ''
+                  and normalize-space(.) != 'none'
+                  and normalize-space(.) != 'None'
+                  and not(contains(., 'zbMATH Open Web Interface contents unavailable due to conflicting licenses'))">
   <relatedIdentifier relatedIdentifierType="URL" relationType="IsCitedBy">
             <xsl:text>https://api.zbmath.org/v1/document/</xsl:text>
             <xsl:value-of select="."/>
         </relatedIdentifier>
+         </xsl:if>
     </xsl:template>
 
 <xsl:template match="references_alt">
     <xsl:variable name="reference" select="."/>
-    <xsl:call-template name="process-reference">
-        <xsl:with-param name="text" select="$reference"/>
-    </xsl:call-template>
+    <xsl:if test="normalize-space($reference) != ''
+                  and normalize-space($reference) != 'none'
+                  and normalize-space($reference) != 'None'
+                  and not(contains($reference, 'zbMATH Open Web Interface contents unavailable due to conflicting licenses'))">
+        <xsl:call-template name="process-reference">
+            <xsl:with-param name="text" select="$reference"/>
+        </xsl:call-template>
+    </xsl:if>
 </xsl:template>
 
+
 <xsl:template name="process-reference">
     <xsl:param name="text"/>
     <xsl:choose>