diff --git a/client/src/views/admin/entity-manager/edit.js b/client/src/views/admin/entity-manager/edit.js
index 8f3276879f..313444f279 100644
--- a/client/src/views/admin/entity-manager/edit.js
+++ b/client/src/views/admin/entity-manager/edit.js
@@ -465,11 +465,11 @@ class EntityManagerEditView extends View {
     }
 
     hideField(name) {
-        this.getView('record').hideField(name);
+        this.getRecordView().hideField(name);
     }
 
     showField(name) {
-        this.getView('record').showField(name);
+        this.getRecordView().showField(name);
     }
 
     toPlural(string) {
@@ -638,14 +638,9 @@ class EntityManagerEditView extends View {
                 Espo.Ui.success(this.translate('Saved')) :
                 Espo.Ui.success(this.translate('entityCreated', 'messages', 'EntityManager'))
 
-            let global = ((this.getLanguage().data || {}) || {}).Global;
-
-            (global.scopeNames || {})[name] = this.model.get('labelSingular');
-            (global.scopeNamesPlural || {})[name] = this.model.get('labelPlural');
-
             this.getMetadata().loadSkipCache()
             .then(
-                Promise.all([
+                () => Promise.all([
                     this.getConfig().load(),
                     this.getLanguage().loadSkipCache(),
                 ])
diff --git a/client/src/views/admin/field-manager/edit.js b/client/src/views/admin/field-manager/edit.js
index 35f5c08ea1..1ac74a0805 100644
--- a/client/src/views/admin/field-manager/edit.js
+++ b/client/src/views/admin/field-manager/edit.js
@@ -510,7 +510,7 @@ define('views/admin/field-manager/edit', ['view', 'model'], function (Dep, Model
         },
 
         afterRender: function () {
-            this.getView('name').on('change', (m) => {
+            this.getView('name').on('change', () => {
                 let name = this.model.get('name');
 
                 let label = name;
diff --git a/client/src/views/admin/link-manager/modals/edit.js b/client/src/views/admin/link-manager/modals/edit.js
index b330f64abe..ed8b3b1108 100644
--- a/client/src/views/admin/link-manager/modals/edit.js
+++ b/client/src/views/admin/link-manager/modals/edit.js
@@ -930,24 +930,11 @@ class LinkManagerEditModalView extends ModalView {
 
                 this.model.fetchedAttributes = this.model.getClonedAttributes();
 
-                let data;
-
-                data = ((this.getLanguage().data || {}) || {})[entity] || {};
-                (data.fields || {})[link] = label;
-                (data.links || {})[link] = label;
-
-                if (entityForeign) {
-                    data = ((this.getLanguage().data || {}) || {})[entityForeign];
-
-                    if (linkForeign) {
-                        (data.fields || {})[linkForeign] = labelForeign;
-                        (data.links || {})[linkForeign] = labelForeign;
-                    }
-                }
-
-                this.getMetadata().loadSkipCache().then(() => {
+                Promise.all([
+                    this.getMetadata().loadSkipCache(),
+                    this.getLanguage().loadSkipCache(),
+                ]).then(() => {
                     this.broadcastUpdate();
-
                     this.trigger('after:save');
 
                     if (!options.noClose) {
@@ -955,7 +942,9 @@ class LinkManagerEditModalView extends ModalView {
                     }
 
                     if (options.noClose) {
-                        this.$el.find('button[data-name="save"]').removeClass('disabled').removeAttr('disabled');
+                        this.$el.find('button[data-name="save"]')
+                            .removeClass('disabled')
+                            .removeAttr('disabled');
                     }
                 });
             })