diff --git a/client/src/utils/works.jsx b/client/src/utils/works.jsx
index 2c04ae9b..eddccf1f 100644
--- a/client/src/utils/works.jsx
+++ b/client/src/utils/works.jsx
@@ -12,7 +12,7 @@ const b64decode = (str) => {
   const binaryString = window.atob(str);
   const len = binaryString.length;
   const bytes = new Uint8Array(new ArrayBuffer(len));
-  for (let i = 0; i < len; i++) {
+  for (let i = 0; i < len; i += 1) {
     bytes[i] = binaryString.charCodeAt(i);
   }
   return bytes;
@@ -43,7 +43,7 @@ const getData = async (options) => {
       const resAffiliations = await unzipData(affiliations);
       const resDatasets = await unzipData(datasets);
       const resPublications = await unzipData(publications);
-      const data = { affiliations: resAffiliations, datasets: resDatasets, publications: resPublications };
+      const data = { affiliations: resAffiliations.affiliations, datasets: resDatasets, publications: resPublications };
       return data;
     }
     console.error(responseAffiliations);
diff --git a/server/src/routes/works.routes.js b/server/src/routes/works.routes.js
index 6c93776f..83192987 100644
--- a/server/src/routes/works.routes.js
+++ b/server/src/routes/works.routes.js
@@ -19,11 +19,51 @@ const arrayBufferToBase64 = (buffer) => {
   return btoa(binary);
 };
 
+function jsonToBlob(json) {
+  const textEncoder = new TextEncoder();
+  const seen = new WeakSet();
+
+  function processValue(value) {
+    if (seen.has(value)) {
+      throw new TypeError('Converting circular structure to JSON');
+    }
+
+    if (value && typeof value.toJSON === 'function') {
+      // eslint-disable-next-line no-param-reassign
+      value = value.toJSON();
+    }
+
+    if (typeof value === 'object' && value !== null) {
+      // seen.add(value);
+
+      const blobParts = [];
+      const entries = Array.isArray(value) ? value : Object.entries(value);
+      for (let i = 0; i < entries.length; i += 1) {
+        if (Array.isArray(value)) {
+          blobParts.push(processValue(entries[i]));
+        } else {
+          const [key, val] = entries[i];
+          blobParts.push(textEncoder.encode(`${JSON.stringify(key)}:`), processValue(val));
+        }
+        if (i !== entries.length - 1) blobParts.push(textEncoder.encode(','));
+      }
+
+      const startBracket = Array.isArray(value) ? '[' : '{';
+      const endBracket = Array.isArray(value) ? ']' : '}';
+      return new Blob([textEncoder.encode(startBracket), ...blobParts, textEncoder.encode(endBracket)]);
+    } if (typeof value === 'function' || typeof value === 'undefined') {
+      return textEncoder.encode('null');
+    }
+    // For primitives we just convert it to string and encode
+    return textEncoder.encode(JSON.stringify(value));
+  }
+
+  return processValue(json);
+}
+
 const compressData = async (result) => {
   // Convert JSON to Stream
-  const stream = new Blob([JSON.stringify(result)], {
-    type: 'application/json',
-  }).stream();
+  const stream = jsonToBlob(result).stream();
   const compressedReadableStream = stream.pipeThrough(
     new CompressionStream('gzip'),
   );
@@ -99,6 +139,7 @@ const getData = async ({ options, type }) => {
   console.timeEnd(`5. Query ${queryId} | Facet ${options.affiliationStrings}`);
   // Build and serialize response
   console.time(`6. Query ${queryId} | Serialization ${options.affiliationStrings}`);
+  const resAffiliations = await compressData({ affiliations: uniqueAffiliations });
   const resDatasets = await compressData({
     publishers: datasetsPublishers,
     results: datasets,
@@ -111,7 +152,6 @@ const getData = async ({ options, type }) => {
     types: publicationsTypes,
     years: publicationsYears,
   });
-  const resAffiliations = await compressData(uniqueAffiliations);
   const result = {
     affiliations: resAffiliations,
     datasets: resDatasets,