diff --git a/src/public/javascripts/dialogs/attributes.js b/src/public/javascripts/dialogs/attributes.js
index 65999d0f0..24597a7d5 100644
--- a/src/public/javascripts/dialogs/attributes.js
+++ b/src/public/javascripts/dialogs/attributes.js
@@ -57,12 +57,12 @@ function AttributesModel() {
         for (const attr of attributes) {
             attr.labelValue = attr.type === 'label' ? attr.value : '';
             attr.relationValue = attr.type === 'relation' ? attr.value : '';
-            attr.labelDefinition = attr.type === 'label-definition' ? JSON.parse(attr.value) : {
+            attr.labelDefinition = (attr.type === 'label-definition' && attr.value) ? JSON.parse(attr.value) : {
                 labelType: "text",
                 multiplicityType: "singlevalue",
                 isPromoted: true
             };
-            attr.relationDefinition = attr.type === 'relation-definition' ? JSON.parse(attr.value) : {
+            attr.relationDefinition = (attr.type === 'relation-definition' && attr.value) ? JSON.parse(attr.value) : {
                 multiplicityType: "singlevalue",
                 isPromoted: true
             };
@@ -180,7 +180,11 @@ function AttributesModel() {
                 isDeleted: 0,
                 position: 0,
                 labelDefinition: {
-                    valueType: "text",
+                    labelType: "text",
+                    multiplicityType: "singlevalue",
+                    isPromoted: true
+                },
+                relationDefinition: {
                     multiplicityType: "singlevalue",
                     isPromoted: true
                 }
@@ -247,7 +251,7 @@ $dialog.on('focus', '.attribute-name', function (e) {
         $(this).autocomplete({
             source: async (request, response) => {
                 const attribute = attributesModel.getTargetAttribute(this);
-                const type = attribute().type === 'relation' ? 'relation' : 'label';
+                const type = (attribute().type === 'relation' || attribute().type === 'relation-definition') ? 'relation' : 'label';
                 const names = await server.get('attributes/names/?type=' + type + '&query=' + encodeURIComponent(request.term));
                 const result = names.map(name => {
                     return {
diff --git a/src/public/javascripts/services/tooltip.js b/src/public/javascripts/services/tooltip.js
index 82ceb5098..706afad87 100644
--- a/src/public/javascripts/services/tooltip.js
+++ b/src/public/javascripts/services/tooltip.js
@@ -23,7 +23,7 @@ function setupTooltip() {
                     if (note.type === 'text') {
                         callback(note.content);
                     }
-                    else if (note.type === 'code') {console.log($("<pre>").text(note.content).html());
+                    else if (note.type === 'code') {
                         callback($("<pre>").text(note.content).prop('outerHTML'));
                     }
                     // other types of notes don't have tooltip preview
diff --git a/src/views/index.ejs b/src/views/index.ejs
index 33cd33ae3..8281b10e6 100644
--- a/src/views/index.ejs
+++ b/src/views/index.ejs
@@ -606,6 +606,12 @@
 
                     <input type="checkbox" value="true" data-bind="checked: labelDefinition.isPromoted" /> Promoted
                   </div>
+
+                  <div data-bind="visible: type == 'relation-definition'">
+                    <select data-bind="options: $parent.multiplicityTypes, optionsText: 'text', optionsValue: 'value', value: relationDefinition.multiplicityType"></select>
+
+                    <input type="checkbox" value="true" data-bind="checked: relationDefinition.isPromoted" /> Promoted
+                  </div>
                 </td>
                 <td title="Inheritable relations are automatically inherited to the child notes">
                   <input type="checkbox" value="1" data-bind="checked: isInheritable" />