diff --git a/test/data/software/Test_Result_Codemeta.xml b/test/data/software/Test_Result_Codemeta.xml
index 2b37a9b6..45835402 100644
--- a/test/data/software/Test_Result_Codemeta.xml
+++ b/test/data/software/Test_Result_Codemeta.xml
@@ -24,83 +24,83 @@
    <codemeta:codeRepository>https://github.com/cran/Boruta</codemeta:codeRepository>
  <codemeta:supportingData>
       <codemeta:name>R</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/771</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/771</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>randomForest</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/10639</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/10639</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>caret</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/8031</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/8031</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>mlr</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/12357</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/12357</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>GeneSrF</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/8254</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/8254</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>XGBoost</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/21035</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/21035</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>shap</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/30901</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/30901</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>VSURF</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/27884</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/27884</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>varSelRF</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/8253</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/8253</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>CRAN</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/4351</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/4351</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>FSelector</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/8044</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/8044</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>UCI-ml</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/4074</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/4074</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>glmnet</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/8159</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/8159</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>ranger</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/14498</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/14498</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>e1071</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/7985</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/7985</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>GeneralisedCovarianceMeasure</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/35668</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/35668</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>cpi</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/41086</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/41086</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>ElemStatLearn</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/11049</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/11049</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>gbm</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/7994</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/7994</codemeta:id>
    </codemeta:supportingData>
    <codemeta:supportingData>
       <codemeta:name>rpart</codemeta:name>
-      <codemeta:identifier>https://swmath.org/software/7115</codemeta:identifier>
+      <codemeta:id>https://swmath.org/software/7115</codemeta:id>
    </codemeta:supportingData>
    <codemeta:referencePublication>
       <codemeta:datePublished>2010</codemeta:datePublished>
diff --git a/xslt/software/xslt-software-Codemeta.xslt b/xslt/software/xslt-software-Codemeta.xslt
index d39c91fb..a1e121dc 100644
--- a/xslt/software/xslt-software-Codemeta.xslt
+++ b/xslt/software/xslt-software-Codemeta.xslt
@@ -45,6 +45,7 @@
 
              <xsl:apply-templates select="root/references"/>
 
+
             <xsl:apply-templates select="root/id"/>
 
         </entry>
@@ -176,10 +177,10 @@
         <codemeta:name>
             <xsl:value-of select="name"/>
         </codemeta:name>
-        <codemeta:identifier>
+        <codemeta:id>
             <xsl:text>https://swmath.org/software/</xsl:text>
             <xsl:value-of select="id"/>
-        </codemeta:identifier>
+        </codemeta:id>
       </codemeta:supportingData>
   </xsl:if>
     </xsl:template>
@@ -189,10 +190,10 @@
         <codemeta:referencePublication>
             <!-- Check if 'id' exists and is not 'None' or empty -->
             <xsl:if test="normalize-space(id) != '' and id != 'None'">
-                <codemeta:identifier>
+                <codemeta:id>
                     <xsl:text>https://zbmath.org/</xsl:text>
                     <xsl:value-of select="id"/>
-                </codemeta:identifier>
+                </codemeta:id>
             </xsl:if>
 
             <!-- Check if 'year' exists and is not 'None' or empty -->
@@ -207,10 +208,12 @@
 
          <xsl:template match="references">
   <xsl:if test="normalize-space(.) != '' and . != 'None'">
-        <codemeta:citation>
+      <codemeta:citation>
+        <codemeta:id>
             <xsl:text>https://api.zbmath.org/v1/document/</xsl:text>
             <xsl:value-of select="."/>
-        </codemeta:citation>
+        </codemeta:id>
+      </codemeta:citation>
        </xsl:if>
     </xsl:template>
 
diff --git a/xslt/software/xslt-software-OpenAire.xslt b/xslt/software/xslt-software-OpenAire.xslt
index c56e237c..10818a5b 100644
--- a/xslt/software/xslt-software-OpenAire.xslt
+++ b/xslt/software/xslt-software-OpenAire.xslt
@@ -38,11 +38,14 @@
                  <xsl:apply-templates select="root/references"/>
              </datacite:relatedIdentifiers>
            </xsl:if>
-           <datacite:alternateIdentifiers>
-           <datacite:alternateIdentifier alternateIdentifierType="URL">
-            <xsl:apply-templates  select="root/homepage"/>
+         <xsl:if test="normalize-space(root/homepage) != '' and root/homepage != 'None' and root/homepage != 'none'">
+    <datacite:alternateIdentifiers>
+        <datacite:alternateIdentifier alternateIdentifierType="URL">
+            <xsl:value-of select="root/homepage"/>
         </datacite:alternateIdentifier>
-           </datacite:alternateIdentifiers>
+    </datacite:alternateIdentifiers>
+       </xsl:if>
+
 
              <xsl:apply-templates select="root/license_terms"/>