diff --git a/src/core/xsl/entity_palette.xsl b/src/core/xsl/entity_palette.xsl
index 65f2bb7ccdbb15b83a5e4c1865e4686d06701bb6..961a51dc51584c3fe87496e54f9837fcec9de0b0 100644
--- a/src/core/xsl/entity_palette.xsl
+++ b/src/core/xsl/entity_palette.xsl
@@ -52,13 +52,13 @@
 
   <xsl:template match="Property">
     <xsl:choose>
-      <xsl:when test="name()='name'">
+      <xsl:when test="@name='name'">
           <!-- ignore name property -->
       </xsl:when>
-      <xsl:when test="name()='description'">
+      <xsl:when test="@name='description'">
           <!-- ignore description property -->
       </xsl:when>
-      <xsl:when test="name()='unit'">
+      <xsl:when test="@name='unit'">
           <!-- ignore unit property -->
       </xsl:when>
       <xsl:otherwise>
diff --git a/test/core/js/modules/edit_mode.js.js b/test/core/js/modules/edit_mode.js.js
index 90b23caa2cee49d350eef5683f366836adf6b6eb..e1d743417d4e8c1b98b9a14ef6ac698b04f65975 100644
--- a/test/core/js/modules/edit_mode.js.js
+++ b/test/core/js/modules/edit_mode.js.js
@@ -254,7 +254,7 @@ QUnit.test("make_datatype_input", function (assert) {
     const form_wrapper = "<form/>";
 
     const no_dt_input = edit_mode.make_datatype_input(undefined);
-    no_dt_input[1].addEventListener("caosdb.field.ready", function (e) {
+    no_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
             .form_to_object($(form_wrapper).append(no_dt_input)[0]);
         assert.propEqual(obj, {
@@ -265,7 +265,7 @@ QUnit.test("make_datatype_input", function (assert) {
     });
 
     const text_dt_input = edit_mode.make_datatype_input("TEXT");
-    text_dt_input[1].addEventListener("caosdb.field.ready", function (e) {
+    text_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
             .form_to_object($(form_wrapper).append(text_dt_input)[0]);
         assert.propEqual(obj, {
@@ -276,7 +276,7 @@ QUnit.test("make_datatype_input", function (assert) {
     });
 
     const ref_dt_input = edit_mode.make_datatype_input("REFERENCE");
-    ref_dt_input[1].addEventListener("caosdb.field.ready", function (e) {
+    ref_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
             .form_to_object($(form_wrapper).append(ref_dt_input)[0]);
         assert.propEqual(obj, {
@@ -287,7 +287,7 @@ QUnit.test("make_datatype_input", function (assert) {
     });
 
     const file_dt_input = edit_mode.make_datatype_input("FILE");
-    file_dt_input[1].addEventListener("caosdb.field.ready", function (e) {
+    file_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
             .form_to_object($(form_wrapper).append(file_dt_input)[0]);
         assert.propEqual(obj, {
@@ -298,7 +298,7 @@ QUnit.test("make_datatype_input", function (assert) {
     });
 
     const person_dt_input = edit_mode.make_datatype_input("Person");
-    person_dt_input[1].addEventListener("caosdb.field.ready", function (e) {
+    person_dt_input.addEventListener("caosdb.field.ready", function (e) {
         var obj = form_elements
             .form_to_object($(form_wrapper).append(person_dt_input)[0]);
         assert.propEqual(obj, {
@@ -309,7 +309,7 @@ QUnit.test("make_datatype_input", function (assert) {
     });
 
     const list_text_dt_input = edit_mode.make_datatype_input("LIST<TEXT>");
-    list_text_dt_input[1].addEventListener("caosdb.field.ready", function (e) {
+    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]);
         assert.propEqual(obj, {
@@ -321,7 +321,7 @@ QUnit.test("make_datatype_input", function (assert) {
     });
 
     const list_ref_dt_input = edit_mode.make_datatype_input("LIST<REFERENCE>");
-    list_ref_dt_input[1].addEventListener("caosdb.field.ready", function (e) {
+    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]);
         assert.propEqual(obj, {
@@ -333,7 +333,7 @@ QUnit.test("make_datatype_input", function (assert) {
     });
 
     const list_file_dt_input = edit_mode.make_datatype_input("LIST<FILE>");
-    list_file_dt_input[1].addEventListener("caosdb.field.ready", function (e) {
+    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]);
         assert.propEqual(obj, {
@@ -345,7 +345,7 @@ QUnit.test("make_datatype_input", function (assert) {
     });
 
     const list_per_dt_input = edit_mode.make_datatype_input("LIST<Person>");
-    list_per_dt_input[1].addEventListener("caosdb.field.ready", function (e) {
+    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]);
         assert.propEqual(obj, {