diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 7eca5cf9..e6c7eea9 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -672,9 +672,11 @@ public class ApplicationEvaluationDao {
             for (CriteriaFormFieldEntity criteriaFormField : criteriaFormFields) {
                 String formFieldId = criteriaFormField.getFormFieldId();
                 if (!mappedFieldMap.containsKey(formFieldId)) {
-                    CriteriaMappedField mappedField = new CriteriaMappedField();
-                    populateMappedField(mappedField, formFieldId, criteriaFormField, applicationForm, applicationId);
-                    mappedFieldMap.put(formFieldId, mappedField);
+//                    CriteriaMappedField mappedField = new CriteriaMappedField();
+                	CriteriaMappedField mappedField = populateMappedField(formFieldId, criteriaFormField, applicationForm, applicationId);
+                	if(mappedField != null) {                		
+                		mappedFieldMap.put(formFieldId, mappedField);
+                	}
                 }
             }
         }
@@ -682,10 +684,14 @@ public class ApplicationEvaluationDao {
         return mappedFieldMap;
     }
 
-    private void populateMappedField(CriteriaMappedField mappedField, String formFieldId,
+    private CriteriaMappedField populateMappedField(String formFieldId,
                                      CriteriaFormFieldEntity criteriaFormField,
                                      ApplicationFormEntity applicationForm, Long applicationId) {
+    	CriteriaMappedField mappedField = new CriteriaMappedField();
         mappedField.setId(formFieldId);
+        if(Boolean.FALSE.equals(criteriaFormField.getFormId().equals(applicationForm.getForm().getId()))) {
+        	return null;
+        }
         formRepository.findById(criteriaFormField.getFormId()).ifPresent(formEntity -> {
 //            List<ContentResponseBean> contentResponseBeans = Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class);
         	List<ContentResponseBean> contentResponseBeans = formDao.convertFormEntityToFormResponseBean(formEntity).getContent();
@@ -710,6 +716,7 @@ public class ApplicationEvaluationDao {
                 }
             });
         });
+        return mappedField;
     }