Merge remote-tracking branch 'origin/math2'

# Conflicts:
#	package-lock.json

src/public/app/widgets/attribute_detail.js

@@ -283,7 +283,9 @@ export default class AttributeDetailWidget extends TabAwareWidget {
                     return false;
                 }
 
-                this.attribute.value = suggestion.notePath;
+                const pathChunks = suggestion.notePath.split('/');
+
+                this.attribute.value = pathChunks[pathChunks.length - 1]; // noteId
 
                 this.triggerCommand('updateAttributeList', { attributes: this.allAttributes });
                 this.updateRelatedNotes();

src/public/app/widgets/type_widgets/editable_text.js

@@ -181,7 +181,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
         });
     }
 
-    addTextToActiveEditorEvent(text) {
+    addTextToActiveEditorEvent({text}) {
         if (!this.isActive()) {
             return;
         }