diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 0666930b..3e53021e 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -171,8 +171,10 @@ public class ApplicationEvaluationDao {
 
                     amendmentDocumentResponseBean.setFileDetail(documentResponseBeans);
                 }
+                amendmentDocumentResponseBean.setFieldId("amend_" + applicationAmendmentRequestEntity.getId());
                 amendmentDocumentResponseBean.setLabel(amendmentDetails.getAmendmentNotes());
                 amendmentDocumentResponseBean.setValid(amendmentDetails.getValid());
+                amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean);
             }
             List<AmendmentFormField> amendmentFormFields = Utils.convertJsonStringToList(formField, AmendmentFormField.class);
             if (amendmentFormFields != null) {
@@ -197,8 +199,6 @@ public class ApplicationEvaluationDao {
                     amendmentDocumentResponseBeans.add(formFieldResponseBean);
                 }
             }
-
-            amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean);
         }
 
         response.setAmendmentDetails(amendmentDocumentResponseBeans);