diff --git a/package.json b/package.json
index c0ab2a406..f0b239523 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
   "dependencies": {
     "@musement/iso-duration": "^1.0.0",
     "@openeo/js-client": "^2.5.1",
-    "@openeo/js-commons": "^1.4.0",
+    "@openeo/js-commons": "^1.4.1",
     "@openeo/js-processgraphs": "^1.3.0",
     "@openeo/vue-components": "^2.8.0",
     "ajv": "^6.12.6",
diff --git a/src/export/exporter.js b/src/export/exporter.js
index 5f5e94c26..6d9b8b823 100644
--- a/src/export/exporter.js
+++ b/src/export/exporter.js
@@ -190,7 +190,14 @@ export default class Exporter extends ProcessGraph {
 	}
 
 	async resolveCallback(node, key) {
-		let callback = node.getArgument(key);
+		let callback;
+		if (node.process_id === 'load_collection') {
+			let properties = node.getArgument('properties');
+			callback = properties[key];
+		}
+		else {
+			callback = node.getArgument(key);
+		}
 		let parameters = callback.getCallbackParameters();
 		await callback.execute(parameters);
 		let fnName = this.var(`${key}${this.fnCounter++}`, 'fn_');
@@ -253,7 +260,7 @@ export default class Exporter extends ProcessGraph {
 			return `${id}_`;
 		}
 		if (!id.match(/^[a-z_]\w*$/)) {
-			return `${prefix}${id}`;
+			return prefix + id.replace(/[^\w]+/g, '_');
 		}
 		else {
 			return id;