diff --git a/client/src/utils/files.jsx b/client/src/utils/files.jsx
index 442b405..ef68b59 100644
--- a/client/src/utils/files.jsx
+++ b/client/src/utils/files.jsx
@@ -32,7 +32,7 @@ const export2FosmCsv = ({ data, label, searchParams }) => {
   let idsToExport = ['doi', 'hal_id', 'nnt_id', 'openalex'];
   // For datasets
   if (label === 'datasets') {
-    idsToExport = ['datacite', 'crossref'];
+    idsToExport = ['doi'];
   }
   const rows = data
     .filter((publication) => publication.status === status.validated.id)
diff --git a/server/src/utils/works.js b/server/src/utils/works.js
index 7579ad4..8df24f3 100644
--- a/server/src/utils/works.js
+++ b/server/src/utils/works.js
@@ -182,7 +182,7 @@ const formatFosmResult = (result, options) => {
   answer.nbPublicationsLinked = answer.fr_publications_linked.length;
   answer.matchingRoRs = getMatchingRoRs(answer?.affiliations || [], options);
   answer.nbMatchingRoRs = answer.matchingRoRs.length;
-  answer.nbAffiliations = answer.affiliations.length;
+  answer.nbAffiliations = answer.affiliations?.length || 0;
   let levelCertainty = '2.medium';
   if (answer.nbMatchingRoRs > 0 || answer.nbPublicationsLinked > 0 || answer.nbOrcid >= 2 || answer.nbAuthorsName >= 3) {
     levelCertainty = '1.high';