diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptionpropertiesdefinition/FieldBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptionpropertiesdefinition/FieldBuilder.java
index 84927c4f9..50be8a7e7 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptionpropertiesdefinition/FieldBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptionpropertiesdefinition/FieldBuilder.java
@@ -3,6 +3,7 @@ package eu.eudat.model.builder.descriptionpropertiesdefinition;
 import eu.eudat.authorization.AuthorizationFlags;
 import eu.eudat.commons.enums.FieldType;
 import eu.eudat.commons.types.description.FieldEntity;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.SelectDataEntity;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.model.Reference;
 import eu.eudat.model.builder.BaseBuilder;
@@ -70,7 +71,17 @@ public class FieldBuilder extends BaseBuilder<Field, FieldEntity> {
             Field m = new Field();
             if (fields.hasField(this.asIndexer(Field._dateValue)) && FieldType.isDateType(fieldType)) m.setDateValue(d.getDateValue());
             if (fields.hasField(this.asIndexer(Field._textValue)) && FieldType.isTextType(fieldType)) m.setTextValue(d.getTextValue());
-            if (fields.hasField(this.asIndexer(Field._textListValue)) && FieldType.isTextListType(fieldType)) m.setTextListValue(d.getTextListValue());
+            if (fields.hasField(this.asIndexer(Field._textListValue)) && FieldType.isTextListType(fieldType)) {
+                boolean isSelectMultiSelect = true;
+                if(this.fieldEntity != null && this.fieldEntity.getData() != null && this.fieldEntity.getData().getFieldType().equals(FieldType.SELECT) && this.fieldEntity.getData() instanceof SelectDataEntity){
+                    isSelectMultiSelect = ((SelectDataEntity) this.fieldEntity.getData()).getMultipleSelect();
+                }
+                if (fieldType.equals(FieldType.SELECT) && !isSelectMultiSelect && !this.conventionService.isListNullOrEmpty(d.getTextListValue())){
+                    m.setTextValue(d.getTextListValue().stream().findFirst().orElse(null));
+                } else{
+                    m.setTextListValue(d.getTextListValue());
+                }
+            }
             if (!referenceFields.isEmpty() &&  FieldType.isReferenceType(fieldType)  && referenceItemsMap != null && d.getTextListValue() != null && !d.getTextListValue().isEmpty()) {
                 m.setReferences(new ArrayList<>());
                 for (UUID referenceId : d.getTextListValue().stream().map(UUID::fromString).toList()){
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptionpropertiesdefinition/PropertyDefinitionFieldSetItemBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptionpropertiesdefinition/PropertyDefinitionFieldSetItemBuilder.java
index 5e653ea6d..a9200a522 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptionpropertiesdefinition/PropertyDefinitionFieldSetItemBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptionpropertiesdefinition/PropertyDefinitionFieldSetItemBuilder.java
@@ -67,7 +67,7 @@ public class PropertyDefinitionFieldSetItemBuilder extends BaseBuilder<PropertyD
             if (!fieldsFields.isEmpty() && d.getFields() != null && !d.getFields().isEmpty()) {
                 m.setFields(new HashMap<>());
                 for (String key : d.getFields().keySet()){
-                    FieldEntity fieldEntity = fieldSetEntity != null ? fieldSetEntity.getAllField().stream().findFirst().orElse(null) : null;
+                    FieldEntity fieldEntity = fieldSetEntity != null ? fieldSetEntity.getFieldById(key).stream().findFirst().orElse(null) : null;
                     m.getFields().put(key, this.builderFactory.builder(FieldBuilder.class).authorize(this.authorize).withFieldEntity(fieldEntity).build(fieldsFields, d.getFields().get(key)));
                 }
             }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/description/DescriptionServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/description/DescriptionServiceImpl.java
index 8bdf334c0..c4435b141 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/description/DescriptionServiceImpl.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/description/DescriptionServiceImpl.java
@@ -381,7 +381,7 @@ public class DescriptionServiceImpl implements DescriptionService {
             data.setComment(persist.getComment());
             data.setFields(new HashMap<>());
             for (String key: persist.getFields().keySet()) {
-                eu.eudat.commons.types.descriptiontemplate.FieldEntity fieldEntity = fieldSetEntity != null ? fieldSetEntity.getAllField().stream().findFirst().orElse(null) : null;
+                eu.eudat.commons.types.descriptiontemplate.FieldEntity fieldEntity = fieldSetEntity != null ? fieldSetEntity.getFieldById(key).stream().findFirst().orElse(null) : null;
                 data.getFields().put(key, this.buildFieldEntity(persist.getFields().get(key), fieldEntity, fieldToReferenceMap));
             }
         }
@@ -416,7 +416,11 @@ public class DescriptionServiceImpl implements DescriptionService {
                     if (!existingIds.contains(id)) throw new MyNotFoundException(messageSource.getMessage("General_ItemNotFound", new Object[]{id, Description.class.getSimpleName()}, LocaleContextHolder.getLocale()));
                 }
             }
-            data.setTextListValue(persist.getTextListValue());
+            if (fieldType.equals(FieldType.SELECT) && this.conventionService.isListNullOrEmpty(persist.getTextListValue()) && !this.conventionService.isNullOrEmpty(persist.getTextValue())){
+                data.setTextListValue(List.of(persist.getTextValue()));
+            } else{
+                data.setTextListValue(persist.getTextListValue());
+            }
         }
         else if (FieldType.isReferenceType(fieldType) && fieldEntity != null ) {
             List<UUID> referenceIds = fieldToReferenceMap.getOrDefault(fieldEntity.getId(), null);
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-type/radio-box/description-template-editor-radio-box-field.component.html b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-type/radio-box/description-template-editor-radio-box-field.component.html
index 1438d3bec..3edda54bb 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-type/radio-box/description-template-editor-radio-box-field.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-type/radio-box/description-template-editor-radio-box-field.component.html
@@ -36,7 +36,7 @@
 		</div>
 	</div>
 	<div class="col-auto">
-		<button mat-icon-button (click)="addNewRow()" type="button">
+		<button mat-icon-button [disabled]="this.form.disabled" (click)="addNewRow()" type="button">
 			<mat-icon>add</mat-icon>
 		</button>
 
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-type/select/description-template-editor-select-field.component.html b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-type/select/description-template-editor-select-field.component.html
index 466dfee8d..1c297f479 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-type/select/description-template-editor-select-field.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field-type/select/description-template-editor-select-field.component.html
@@ -37,7 +37,7 @@
 		</div>
 	</div>
 	<mat-error *ngIf="form.get('data').get('options').hasError('backendError')">{{form.get('data').get('options').getError('backendError').message}}</mat-error>
-	<div class="col-auto"><button mat-icon-button (click)="addNewRow()">
+	<div class="col-auto"><button mat-icon-button [disabled]="this.form.disabled" (click)="addNewRow()">
 			<mat-icon>add</mat-icon>
 		</button></div>
 </div>
\ No newline at end of file