diff --git a/src/core/js/edit_mode.js b/src/core/js/edit_mode.js
index 9df7505f1e81fd0234aaa4461444535846921885..5da4303fb7227e12b38ca2d23628e21a4c996c63 100644
--- a/src/core/js/edit_mode.js
+++ b/src/core/js/edit_mode.js
@@ -411,7 +411,7 @@ var edit_mode = new function() {
      *     entity in XML representation.
      */
     this.form_to_xml = function(entity_form) {
-        const obj = form_elements.form_to_object($(entity_form).find("form")[0]);
+        const obj = form_elements.form_to_object($(entity_form).find("form")[0])[0];
         var entityRole = getEntityRole(entity_form);
         var file_path = undefined;
         var file_checksum = undefined;
diff --git a/src/core/js/form_elements.js b/src/core/js/form_elements.js
index 248523ba61c3b97ebf14413675abb88edac13ce9..59397d76f158b931aec61da5a6b66b4b887c4562 100644
--- a/src/core/js/form_elements.js
+++ b/src/core/js/form_elements.js
@@ -931,7 +931,7 @@ var form_elements = new function () {
         this.disable_fields($(form).find(".caosdb-f-field[data-field-name='" + name + "']").toArray());
     }
 
-    this.make_script_form = async function (config, script) {
+    this.make_script_form = function (config, script) {
         this.logger.trace("enter make_script_form");
 
         const submit_callback = async function (form) {
@@ -960,7 +960,7 @@ var form_elements = new function () {
             name: script,
             submit: submit_callback
         }, config);
-        return await this.make_generic_form(new_config);
+        return this.make_generic_form(new_config);
     }
 
     /**
diff --git a/test/core/js/modules/edit_mode.js.js b/test/core/js/modules/edit_mode.js.js
index ae11b04a380f162018de70a53409e34b4e6990c6..40d2a3b1984109d8caf64fbd181e02a9c3aafa88 100644
--- a/test/core/js/modules/edit_mode.js.js
+++ b/test/core/js/modules/edit_mode.js.js
@@ -255,7 +255,7 @@ QUnit.test("make_datatype_input", function (assert) {
     const no_dt_input = edit_mode.make_datatype_input(undefined);
     no_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
-            .form_to_object($(form_wrapper).append(no_dt_input)[0]);
+            .form_to_object($(form_wrapper).append(no_dt_input)[0])[0];
         assert.propEqual(obj, {
             "atomic_datatype": "TEXT",
             "reference_scope": null,
@@ -266,7 +266,7 @@ QUnit.test("make_datatype_input", function (assert) {
     const text_dt_input = edit_mode.make_datatype_input("TEXT");
     text_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
-            .form_to_object($(form_wrapper).append(text_dt_input)[0]);
+            .form_to_object($(form_wrapper).append(text_dt_input)[0])[0];
         assert.propEqual(obj, {
             "atomic_datatype": "TEXT",
             "reference_scope": null,
@@ -277,7 +277,7 @@ QUnit.test("make_datatype_input", function (assert) {
     const ref_dt_input = edit_mode.make_datatype_input("REFERENCE");
     ref_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
-            .form_to_object($(form_wrapper).append(ref_dt_input)[0]);
+            .form_to_object($(form_wrapper).append(ref_dt_input)[0])[0];
         assert.propEqual(obj, {
             "atomic_datatype": "REFERENCE",
             "reference_scope": null,
@@ -288,7 +288,7 @@ QUnit.test("make_datatype_input", function (assert) {
     const file_dt_input = edit_mode.make_datatype_input("FILE");
     file_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
-            .form_to_object($(form_wrapper).append(file_dt_input)[0]);
+            .form_to_object($(form_wrapper).append(file_dt_input)[0])[0];
         assert.propEqual(obj, {
             "atomic_datatype": "FILE",
             "reference_scope": null,
@@ -299,7 +299,7 @@ QUnit.test("make_datatype_input", function (assert) {
     const person_dt_input = edit_mode.make_datatype_input("Person");
     person_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
-            .form_to_object($(form_wrapper).append(person_dt_input)[0]);
+            .form_to_object($(form_wrapper).append(person_dt_input)[0])[0];
         assert.propEqual(obj, {
             "atomic_datatype": "REFERENCE",
             "reference_scope": "Person",
@@ -310,7 +310,7 @@ QUnit.test("make_datatype_input", function (assert) {
     const list_text_dt_input = edit_mode.make_datatype_input("LIST<TEXT>");
     list_text_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
-            .form_to_object($(form_wrapper).append(list_text_dt_input)[0]);
+            .form_to_object($(form_wrapper).append(list_text_dt_input)[0])[0];
         assert.propEqual(obj, {
             "atomic_datatype": "TEXT",
             "reference_scope": null,
@@ -322,7 +322,7 @@ QUnit.test("make_datatype_input", function (assert) {
     const list_ref_dt_input = edit_mode.make_datatype_input("LIST<REFERENCE>");
     list_ref_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
-            .form_to_object($(form_wrapper).append(list_ref_dt_input)[0]);
+            .form_to_object($(form_wrapper).append(list_ref_dt_input)[0])[0];
         assert.propEqual(obj, {
             "atomic_datatype": "REFERENCE",
             "reference_scope": null,
@@ -334,7 +334,7 @@ QUnit.test("make_datatype_input", function (assert) {
     const list_file_dt_input = edit_mode.make_datatype_input("LIST<FILE>");
     list_file_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
-            .form_to_object($(form_wrapper).append(list_file_dt_input)[0]);
+            .form_to_object($(form_wrapper).append(list_file_dt_input)[0])[0];
         assert.propEqual(obj, {
             "atomic_datatype": "FILE",
             "reference_scope": null,
@@ -346,7 +346,7 @@ QUnit.test("make_datatype_input", function (assert) {
     const list_per_dt_input = edit_mode.make_datatype_input("LIST<Person>");
     list_per_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
-            .form_to_object($(form_wrapper).append(list_per_dt_input)[0]);
+            .form_to_object($(form_wrapper).append(list_per_dt_input)[0])[0];
         assert.propEqual(obj, {
             "atomic_datatype": "REFERENCE",
             "reference_scope": "Person",