diff --git a/src/components/query/QueryMultipleArchives.js b/src/components/query/QueryMultipleArchives.js
index b148f14d06a421f5ba3fa758c0432285bfa51da4..530a72a36c50a10d224577c245ff20d89ea26a45 100644
--- a/src/components/query/QueryMultipleArchives.js
+++ b/src/components/query/QueryMultipleArchives.js
@@ -45,7 +45,20 @@ export default function QueryMultipleArchives() {
         let archive_queries = []
 
         // create a list of queries based on the filled in form
-        let queries = parseQueryForm(query_schema_name, formData);
+        // let queries = parseQueryForm(query_schema_name, formData);
+        let base_query = parseQueryForm(query_schema_name, formData);
+        let archives = config.archives
+        let queries = [];
+        archives.map((archive) => {
+            let esap_query = base_query + "&archive_uri=" + archive
+
+            queries.push({
+                archive: archive,
+                esap_query: esap_query,
+            });
+            return null;
+        });
+
 
         console.log("queries:", queries);
 
diff --git a/src/utils/form/parseMultipleArchivesForm.js b/src/utils/form/parseMultipleArchivesForm.js
index 6dc536abeda8bbfe110982c3aea24871ab8435fe..8e3339c01c39d9ad94d5e92e2e2ae90c0659f3b7 100644
--- a/src/utils/form/parseMultipleArchivesForm.js
+++ b/src/utils/form/parseMultipleArchivesForm.js
@@ -1,32 +1,14 @@
 export default function parseMultipleArchivesForm(formData) {
 
-    // now hardcoded, later read this from the configuration on the backend
-    //let archives = ["apertif", "astron_vo"];
-    let archives = ["apertif","astron_vo"];
-
-    let queries = [];
     let base_query = "";
     let formInput = Object.entries(formData);
 
-
-    // construct the base esap_query by iterating over all the fields in the form
+    // construct the esap base query by iterating over all the fields in the form
     for (let [key, value] of formInput) {
         base_query += `${`${base_query}` ? "&" : ""}` + key + "=" + value;
     }
 
     console.log("base_query:", base_query);
-    console.log("archives:", archives);
-
-    archives.map((archive) => {
-        let esap_query = base_query + "&archive_uri=" + archive
-
-        queries.push({
-            archive: archive,
-            esap_query: esap_query,
-        });
-        return null;
-    });
 
-  console.log("queries:", queries);
-  return queries;
+    return base_query
 }