diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/JournalRepositoryDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/JournalRepositoryDataBuilder.java
index a78fc4d4a..e344b16d9 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/JournalRepositoryDataBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/JournalRepositoryDataBuilder.java
@@ -1,8 +1,10 @@
 package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
 
 import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.JournalRepositoryDataEntity;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.model.descriptiontemplatedefinition.fielddata.DataRepositoryData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.JournalRepositoryData;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;
@@ -13,19 +15,19 @@ import org.springframework.stereotype.Component;
 
 @Component
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class JournalRepositoryDataBuilder extends BaseFieldDataBuilder<DataRepositoryData, DataRepositoryDataEntity> {
+public class JournalRepositoryDataBuilder extends BaseFieldDataBuilder<JournalRepositoryData, JournalRepositoryDataEntity> {
 
 	@Autowired
 	public JournalRepositoryDataBuilder(ConventionService conventionService) {
 		super(conventionService, new LoggerService(LoggerFactory.getLogger(JournalRepositoryDataBuilder.class)));
 	}
 
-	protected DataRepositoryData getInstance() {
-		return new DataRepositoryData();
+	protected JournalRepositoryData getInstance() {
+		return new JournalRepositoryData();
 	}
 
 	@Override
-	protected void buildChild(FieldSet fields, DataRepositoryDataEntity d, DataRepositoryData m) {
-		if (fields.hasField(this.asIndexer(DataRepositoryData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
+	protected void buildChild(FieldSet fields, JournalRepositoryDataEntity d, JournalRepositoryData m) {
+		if (fields.hasField(this.asIndexer(JournalRepositoryData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
 	}
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperServiceProvider.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperServiceProvider.java
index 15a44dacb..8d7e9a3d6 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperServiceProvider.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperServiceProvider.java
@@ -111,7 +111,7 @@ public class FieldDataHelperServiceProvider {
 				break;
 			}
 			case WORD_LIST: {
-				item = this.applicationContext.getBean(ValidationFieldDataHelperService.class);
+				item = this.applicationContext.getBean(WordListFieldDataHelperService.class);
 				break;
 			}
 			case AUTO_COMPLETE: {