diff --git a/dmp-frontend/src/app/core/services/auth/auth.service.ts b/dmp-frontend/src/app/core/services/auth/auth.service.ts
index fce7ca3e7..fd6d59630 100644
--- a/dmp-frontend/src/app/core/services/auth/auth.service.ts
+++ b/dmp-frontend/src/app/core/services/auth/auth.service.ts
@@ -301,7 +301,7 @@ export class AuthService extends BaseService {
 	onAuthenticateSuccess(returnUrl: string): void {
 		this.authState(true);
 		this.uiNotificationService.snackBarNotification(
-			this.language.instant('COMMONS.SNACK-BAR.SUCCESSFUL-LOGIN'),
+			this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-LOGIN'),
 			SnackBarNotificationLevel.Success
 		);
 		this.zone.run(() => this.router.navigate([returnUrl]));
diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.component.html b/dmp-frontend/src/app/ui/description/editor/description-editor.component.html
index 702dbe110..536e744b6 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-editor.component.html
+++ b/dmp-frontend/src/app/ui/description/editor/description-editor.component.html
@@ -34,15 +34,15 @@
 									<mat-menu #exportMenu="matMenu" xPosition="before">
 										<button mat-menu-item (click)="downloadPDF(formGroup.get('id').value)">
 											<i class="fa fa-file-pdf-o pr-2"></i>
-											<span>{{'GENERAL.FILE-TRANSFOMER.PDF' | translate}}</span>
+											<span>{{'GENERAL.FILE-TRANSFORMER.PDF' | translate}}</span>
 										</button>
 										<button mat-menu-item (click)="downloadDOCX(formGroup.get('id').value)">
 											<i class="fa fa-file-word-o pr-2"></i>
-											<span>{{'GENERAL.FILE-TRANSFOMER.DOC' | translate}}</span>
+											<span>{{'GENERAL.FILE-TRANSFORMER.DOCX' | translate}}</span>
 										</button>
 										<button mat-menu-item (click)="downloadXML(formGroup.get('id').value)">
 											<i class="fa fa-file-code-o pr-2"></i>
-											<span>{{'GENERAL.FILE-TRANSFOMER.XML' | translate}}</span>
+											<span>{{'GENERAL.FILE-TRANSFORMER.XML' | translate}}</span>
 										</button>
 									</mat-menu>
 								</div>
diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.model.ts b/dmp-frontend/src/app/ui/description/editor/description-editor.model.ts
index 8d924a136..72a10d6db 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-editor.model.ts
+++ b/dmp-frontend/src/app/ui/description/editor/description-editor.model.ts
@@ -431,23 +431,19 @@ export class DescriptionFieldEditorModel implements DescriptionFieldPersist {
 			this.dateValue = item.dateValue;
 
 			// this.reference = descriptionReferences?.find(x => x.data?.fieldId == descriptionTemplateField?.id && x.isActive == IsActive.Active)?.reference;
-			if(descriptionReferences){
-				descriptionReferences.forEach(descriptionReference => {
-					if(descriptionReference.data.fieldId == descriptionTemplateField?.id && descriptionReference.isActive == IsActive.Active){
-						this.references.push({					
-							id: descriptionReference.reference.id,
-							label: descriptionReference.reference.label,
-							reference: descriptionReference.reference.reference,
-							source: descriptionReference.reference.source,
-							typeId: null,
-							description: descriptionReference.reference.source,
-							definition: descriptionReference.reference.definition,
-							abbreviation: descriptionReference.reference.abbreviation,
-							sourceType: descriptionReference.reference.sourceType					
-						}) 
-					}
-				})
-			}
+			this.references = descriptionReferences?.filter(x => x.data?.fieldId == descriptionTemplateField?.id && x.isActive == IsActive.Active).map(x => {
+				return {
+					id: x.reference.id,
+					label: x.reference.label,
+					reference: x.reference.reference,
+					source: x.reference.source,
+					typeId: x.reference.type.id,
+					description: x.reference.source,
+					definition: x.reference.definition,
+					abbreviation: x.reference.abbreviation,
+					sourceType: x.reference.sourceType
+				}
+			});
 			this.externalIdentifier = new DescriptionExternalIdentifierEditorModel(this.validationErrorModel).fromModel(item.externalIdentifier);
 		}
 		return this;
diff --git a/dmp-frontend/src/app/ui/inapp-notification/editor/inapp-notification-editor.component.ts b/dmp-frontend/src/app/ui/inapp-notification/editor/inapp-notification-editor.component.ts
index 66b1483fd..20eb79d16 100644
--- a/dmp-frontend/src/app/ui/inapp-notification/editor/inapp-notification-editor.component.ts
+++ b/dmp-frontend/src/app/ui/inapp-notification/editor/inapp-notification-editor.component.ts
@@ -121,7 +121,7 @@ export class InAppNotificationEditorComponent extends BaseComponent implements O
 	}
 
 	onCallbackSuccess(data?: any): void {
-		// this.uiNotificationService.snackBarNotification(this.language.instant('COMMONS.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success);
+		// this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success);
 		// this.router.navigate(['/mine-notifications']);
 	}
 
diff --git a/dmp-frontend/src/common/base/base-editor.ts b/dmp-frontend/src/common/base/base-editor.ts
index 60ea6f7be..f471e0146 100644
--- a/dmp-frontend/src/common/base/base-editor.ts
+++ b/dmp-frontend/src/common/base/base-editor.ts
@@ -109,7 +109,7 @@ export abstract class BaseEditor<EditorModelType extends BaseEditorModel, Entity
 
 		console.log("Success:", data);
 
-		this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('COMMONS.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('COMMONS.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success);
+		this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success);
 		this.refreshOnNavigateToData(data ? data.id : null);
 	}