diff --git a/src/components/query/QueryCatalogs.js b/src/components/query/QueryCatalogs.js
index a7554b7e7601288333cc71f8bf1c7eb2f42874b2..662fd13330cc9325ce99cd85888a9ab3c211912a 100644
--- a/src/components/query/QueryCatalogs.js
+++ b/src/components/query/QueryCatalogs.js
@@ -40,6 +40,10 @@ export default function QueryCatalogs() {
       default:
         setConfigName("esap_ivoa");
     }
+    return () => {
+      console.log("cleaned up");
+      setConfigName("esap_ivoa");
+    };
   }, [uri]);
 
   useEffect(() => {
diff --git a/src/contexts/GlobalContext.js b/src/contexts/GlobalContext.js
index 04ccbf45edf45304985dff5f28588436dfc9f275..e18b2eb607345a265f8060ccbf209a52e6d63753 100644
--- a/src/contexts/GlobalContext.js
+++ b/src/contexts/GlobalContext.js
@@ -8,7 +8,7 @@ export function GlobalContextProvider({ children }) {
   console.log("ASTRON ESAP version 14 aug 2020");
   const api_host =
     process.env.NODE_ENV === "development"
-      ? "http://localhost:8000/esap-api/"
+      ? "http://localhost:15671/esap-api/"
       : "/esap-api/";
 
   const [config, setConfig] = useState();
diff --git a/src/utils/form/parseASTRONVOForm.js b/src/utils/form/parseASTRONVOForm.js
index 3c4a4694f0f8f66d6dcc14186d89d456185fe2d8..8724fc5aabc2c2c9d2a6cda65687d5f6d5b78b1d 100644
--- a/src/utils/form/parseASTRONVOForm.js
+++ b/src/utils/form/parseASTRONVOForm.js
@@ -1,5 +1,4 @@
 export default function ParseASTRONVOForm(formData) {
-  let catalogs = "astron_vo";
   let queries = [];
   // queries is an array of dictionaries, where each dictionary consists of
   // {"catalog": "catalogname",
@@ -20,25 +19,11 @@ export default function ParseASTRONVOForm(formData) {
   //  "status": "null|fetching|fetched",
   //  "results": null}
   let catalog = formInput.find(([key]) => key === "catalog")[1];
-  if (catalog === "all") {
-    console.log("Catalogs:", catalogs);
-    catalogs.map((catalog) => {
-      let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
-
-      queries.push({
-        catalog: catalog,
-        esapquery: esapquery,
-      });
-      return null;
-    });
-  } else {
-    let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
-
-    queries.push({
-      catalog: catalog,
-      esapquery: esapquery,
-    });
-  }
+  let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
+  queries.push({
+    catalog: catalog,
+    esapquery: esapquery,
+  });
   console.log("Queries:", queries);
   return queries;
 }
diff --git a/src/utils/form/parseApertifForm.js b/src/utils/form/parseApertifForm.js
index 1540ce1a41be4dba8b0b8dd8001f68257949cd1b..4a764050acb24deea951cb6778e8e023e62364c6 100644
--- a/src/utils/form/parseApertifForm.js
+++ b/src/utils/form/parseApertifForm.js
@@ -1,5 +1,4 @@
 export default function ParseApertifForm(formData) {
-  let catalogs = "apertif";
   let queries = [];
   // queries is an array of dictionaries, where each dictionary consists of
   // {"catalog": "catalogname",
@@ -20,25 +19,11 @@ export default function ParseApertifForm(formData) {
   //  "status": "null|fetching|fetched",
   //  "results": null}
   let catalog = formInput.find(([key]) => key === "catalog")[1];
-  if (catalog === "all") {
-    console.log("Catalogs:", catalogs);
-    catalogs.map((catalog) => {
-      let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
-
-      queries.push({
-        catalog: catalog,
-        esapquery: esapquery,
-      });
-      return null;
-    });
-  } else {
-    let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
-
-    queries.push({
-      catalog: catalog,
-      esapquery: esapquery,
-    });
-  }
+  let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
+  queries.push({
+    catalog: catalog,
+    esapquery: esapquery,
+  });
   console.log("Queries:", queries);
   return queries;
 }
diff --git a/src/utils/form/parseLOFARForm.js b/src/utils/form/parseLOFARForm.js
index 7446420a0e15f91534608c5a5448fb5580669309..badc2b8512cc5c64457384b6e23c3b435f4eb1d8 100644
--- a/src/utils/form/parseLOFARForm.js
+++ b/src/utils/form/parseLOFARForm.js
@@ -1,5 +1,4 @@
 export default function ParseLOFARForm(formData) {
-  let catalogs = "lofar";
   let queries = [];
   // queries is an array of dictionaries, where each dictionary consists of
   // {"catalog": "catalogname",
@@ -20,25 +19,11 @@ export default function ParseLOFARForm(formData) {
   //  "status": "null|fetching|fetched",
   //  "results": null}
   let catalog = formInput.find(([key]) => key === "catalog")[1];
-  if (catalog === "all") {
-    console.log("Catalogs:", catalogs);
-    catalogs.map((catalog) => {
-      let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
-
-      queries.push({
-        catalog: catalog,
-        esapquery: esapquery,
-      });
-      return null;
-    });
-  } else {
-    let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
-
-    queries.push({
-      catalog: catalog,
-      esapquery: esapquery,
-    });
-  }
+  let esapquery = query + `${`${query}` ? "&" : ""}archive_uri=` + catalog;
+  queries.push({
+    catalog: catalog,
+    esapquery: esapquery,
+  });
   console.log("Queries:", queries);
   return queries;
 }