diff --git a/src/entities/note.js b/src/entities/note.js
index 96c23b0dc..81b9d40d0 100644
--- a/src/entities/note.js
+++ b/src/entities/note.js
@@ -400,7 +400,7 @@ class Note extends Entity {
 
                 const definition = definitionAttr.value;
 
-                if (definition.multiplicityType === 'multivalue') {
+                if (definition.multiplicityType === 'multi') {
                     return true;
                 }
                 else {
diff --git a/src/public/app/widgets/promoted_attributes.js b/src/public/app/widgets/promoted_attributes.js
index 9fc8414bd..b12e5d960 100644
--- a/src/public/app/widgets/promoted_attributes.js
+++ b/src/public/app/widgets/promoted_attributes.js
@@ -51,7 +51,7 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
             return;
         }
 
-        const cells = [];
+        const $cells = [];
 
         for (const definitionAttr of promotedDefAttrs) {
             const valueType = definitionAttr.name.startsWith('label:') ? 'label' : 'relation';
@@ -68,20 +68,20 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
                 });
             }
 
-            if (definitionAttr.value.multiplicity === 'single') {
+            if (definitionAttr.getDefinition().multiplicity === 'single') {
                 valueAttrs = valueAttrs.slice(0, 1);
             }
 
             for (const valueAttr of valueAttrs) {
                 const $cell = await this.createPromotedAttributeCell(definitionAttr, valueAttr, valueName);
 
-                cells.push($cell);
+                $cells.push($cell);
             }
         }
 
         // we replace the whole content in one step so there can't be any race conditions
         // (previously we saw promoted attributes doubling)
-        this.$container.empty().append(...cells);
+        this.$container.empty().append(...$cells);
         this.toggleInt(true);
     }
 
@@ -212,7 +212,7 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
             return;
         }
 
-        if (definition.multiplicity === "multivalue") {
+        if (definition.multiplicity === "multi") {
             const addButton = $("<span>")
                 .addClass("bx bx-plus pointer")
                 .prop("title", "Add new attribute")
@@ -220,9 +220,9 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
                     const $new = await this.createPromotedAttributeCell(definitionAttr, {
                         attributeId: "",
                         type: valueAttr.type,
-                        name: definitionAttr.name,
+                        name: valueName,
                         value: ""
-                    });
+                    }, valueName);
 
                     $wrapper.after($new);
 
@@ -240,7 +240,11 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
                     $wrapper.remove();
                 });
 
-            $multiplicityCell.append(addButton).append(" &nbsp;").append(removeButton);
+            $multiplicityCell
+                .append(" &nbsp;")
+                .append(addButton)
+                .append(" &nbsp;")
+                .append(removeButton);
         }
 
         return $wrapper;
diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs
index af4aa1972..528c24f20 100644
--- a/src/views/desktop.ejs
+++ b/src/views/desktop.ejs
@@ -19,7 +19,6 @@
 
 <%- include('dialogs/about.ejs') %>
 <%- include('dialogs/add_link.ejs') %>
-<%- include('dialogs/attributes.ejs') %>
 <%- include('dialogs/branch_prefix.ejs') %>
 <%- include('dialogs/export.ejs') %>
 <%- include('dialogs/import.ejs') %>
diff --git a/src/views/dialogs/attributes.ejs b/src/views/dialogs/attributes.ejs
deleted file mode 100644
index 458e87b87..000000000
--- a/src/views/dialogs/attributes.ejs
+++ /dev/null
@@ -1,155 +0,0 @@
-<div id="attributes-dialog" class="modal fade mx-auto" tabindex="-1" role="dialog">
-    <div class="modal-dialog modal-xl modal-dialog-scrollable" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title mr-auto">Note attributes</h5>
-
-                <button class="help-button" type="button" data-help-page="Attributes" title="Help on Attributes">?
-                </button>
-
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0;">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <form data-bind="submit: save">
-                    <input type="submit" style="display: none"/>
-
-                    <table id="owned-attributes-table" class="table">
-                        <thead>
-                        <tr>
-                            <th>Type</th>
-                            <th>Name</th>
-                            <th>Value</th>
-                            <th>Inheritable</th>
-                        </tr>
-                        </thead>
-                        <tbody data-bind="foreach: ownedAttributes">
-                        <tr data-bind="if: !isDeleted">
-                            <td>
-                                <input type="hidden" name="position" data-bind="value: position"/>
-
-                                <select class="form-control attribute-type-select" style="width: auto;"
-                                        data-bind="options: $parent.availableTypes, optionsText: 'text', optionsValue: 'value', value: type, event: { change: $parent.typeChanged }"></select>
-                            </td>
-                            <td>
-                                <!-- Change to valueUpdate: blur is necessary because jQuery UI autocomplete hijacks change event -->
-                                <input type="text" class="attribute-name form-control"
-                                       data-bind="value: name, valueUpdate: 'blur',  event: { blur: $parent.attributeChanged }"/>
-                                <div style="color: red" data-bind="if: $parent.isEmptyName($index())">Attribute name
-                                    can't be empty.
-                                </div>
-                            </td>
-                            <td>
-                                <input type="text" class="label-value form-control"
-                                       data-bind="visible: type == 'label', value: labelValue, valueUpdate: 'blur', event: { blur: $parent.attributeChanged }"
-                                       style="width: 300px"/>
-
-                                <div class="relation-value input-group" data-bind="visible: type == 'relation'"
-                                     style="width: 300px;">
-                                    <input class="form-control relation-target-note-id"
-                                           placeholder="search for note by its name"
-                                           data-bind="noteAutocomplete, value: relationValue, valueUpdate: 'blur', event: { blur: $parent.attributeChanged }">
-
-                                    <div style="color: red" data-bind="if: $parent.isEmptyRelationTarget($index())">Relation
-                                        target note
-                                        can't be empty.
-                                    </div>
-                                </div>
-
-                                <div data-bind="visible: type == 'label-definition'">
-                                    <select data-bind="options: $parent.availableLabelTypes, optionsText: 'text', optionsValue: 'value', value: labelDefinition.labelType"></select>
-
-                                    <select data-bind="options: $parent.multiplicityTypes, optionsText: 'text', optionsValue: 'value', value: labelDefinition.multiplicityType"></select>
-
-                                    <label>
-                                        <input type="checkbox" value="true"
-                                               data-bind="checked: labelDefinition.isPromoted"/>
-                                        Promoted
-                                    </label>
-
-                                    <div data-bind="visible: labelDefinition.labelType === 'number'"
-                                         title="Precision of floating point numbers - 0 means effectively integer, 2 allows entering e.g. 1.23">
-                                        Number precision: <input type="number" min="0" max="9"
-                                                                 data-bind="value: labelDefinition.numberPrecision"
-                                                                 style="width: 50px;"/>
-                                    </div>
-                                </div>
-
-                                <div data-bind="visible: type == 'relation-definition'">
-                                    <select data-bind="options: $parent.multiplicityTypes, optionsText: 'text', optionsValue: 'value', value: relationDefinition.multiplicityType"></select>
-
-                                    <label>
-                                        <input type="checkbox" value="true"
-                                               data-bind="checked: relationDefinition.isPromoted"/>
-                                        Promoted
-                                    </label>
-                                    <br/>
-                                    <label>
-                                        Inverse relation:
-
-                                        <input type="text" value="true" class="attribute-name"
-                                               data-bind="value: relationDefinition.inverseRelation"/>
-                                    </label>
-                                </div>
-                            </td>
-                            <td title="Inheritable relations are automatically inherited to the child notes">
-                                <input type="checkbox" value="1" data-bind="checked: isInheritable"/>
-
-                                &nbsp;
-
-                                <span title="Delete" style="padding: 13px; cursor: pointer;" class="bx bx-trash"
-                                      data-bind="click: $parent.deleteAttribute"></span>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </form>
-
-                <div data-bind="if: inheritedAttributes().length > 0">
-                    <h4>Inherited attributes</h4>
-
-                    <table class="table">
-                        <thead>
-                        <tr>
-                            <th>Type</th>
-                            <th>Name</th>
-                            <th>Value</th>
-                            <th>Owning note</th>
-                        </tr>
-                        </thead>
-                        <tbody data-bind="foreach: inheritedAttributes">
-                        <tr>
-                            <td data-bind="text: type"></td>
-                            <td data-bind="text: name"></td>
-                            <td>
-                <span data-bind="if: type == 'label'">
-                  <span data-bind="text: value"></span>
-                </span>
-                                <span data-bind="if: type == 'relation'">
-                  <span data-bind="noteLink: value"></span>
-                </span>
-                                <span data-bind="if: type == 'label-definition'">
-                  <span data-bind="text: value.labelType"></span>
-                  <span data-bind="text: value.multiplicityType"></span>
-                  promoted: <span data-bind="text: value.isPromoted"></span>
-                </span>
-                                <span data-bind="if: type == 'relation-definition'">
-                  <span data-bind="text: value.multiplicityType"></span>
-                  promoted: <span data-bind="text: value.isPromoted"></span>
-                </span>
-                            </td>
-                            <td data-bind="noteLink: noteId"></td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button class="btn btn-primary btn-large" style="width: 200px;" id="save-attributes-button"
-                        data-bind="click: save">
-                    Save changes <kbd>enter</kbd></button>
-            </div>
-        </div>
-    </div>
-</div>