diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 1b725c96..ee5cfe23 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -111,8 +111,10 @@ public class ApplicationEvaluationDao {
         populateBasicDetails(entity, response);
 
         CallEntity call = callRepository.findCallEntityByApplicationId(entity.getApplicationId());
-        List<EvaluationCriteriaEntity> evaluationCriterias = evaluationCriteriaRepository.findByCallId(call.getId());
-        List<CallTargetAudienceChecklistEntity> checklistEntities = callTargetAudienceChecklistRepository.findByCallId(call.getId());
+        List<EvaluationCriteriaEntity> evaluationCriterias = evaluationCriteriaRepository
+                .findByCallIdAndLookupDataTypeAndIsDeletedFalse(call.getId(), LookUpDataEntity.LookUpDataTypeEnum.EVALUATION_CRITERIA.getValue());
+        List<CallTargetAudienceChecklistEntity> checklistEntities = callTargetAudienceChecklistRepository
+                .findByCallIdAndLookupDataTypeAndIsDeletedFalse(call.getId(), LookUpDataEntity.LookUpDataTypeEnum.CHECKLIST.getValue());
         List<ApplicationFormEntity> applicationFormEntities = applicationFormRepository.findByApplicationId(entity.getApplicationId());
 
         setCriteriaResponses(entity, response, evaluationCriterias);
@@ -633,8 +635,10 @@ public class ApplicationEvaluationDao {
             call = callRepository.findCallEntityByApplicationId(applicationId);
             assignedApplications = assignedApplicationsRepository.findByApplicationIdAndIsDeletedFalse(applicationId).orElse(null);
         }
-        List<EvaluationCriteriaEntity> evaluationCriterias = evaluationCriteriaRepository.findByCallId(call.getId());
-        List<CallTargetAudienceChecklistEntity> checklistEntities = callTargetAudienceChecklistRepository.findByCallId(call.getId());
+        List<EvaluationCriteriaEntity> evaluationCriterias = evaluationCriteriaRepository
+                .findByCallIdAndLookupDataTypeAndIsDeletedFalse(call.getId(), LookUpDataEntity.LookUpDataTypeEnum.EVALUATION_CRITERIA.getValue());
+        List<CallTargetAudienceChecklistEntity> checklistEntities = callTargetAudienceChecklistRepository
+                .findByCallIdAndLookupDataTypeAndIsDeletedFalse(call.getId(), LookUpDataEntity.LookUpDataTypeEnum.CHECKLIST.getValue());
         List<ApplicationFormEntity> applicationFormEntities = applicationFormRepository.findByApplicationId(applicationId);
         response.setApplicationId(application.getId());
         response.setAssignedApplicationId(assignedApplications.getId());
@@ -966,7 +970,8 @@ public class ApplicationEvaluationDao {
     }
 
     private List<EvaluationCriteriaEntity> getEvaluationCriterias(CallEntity call) {
-        return evaluationCriteriaRepository.findByCallId(call.getId());
+        return  evaluationCriteriaRepository
+                .findByCallIdAndLookupDataTypeAndIsDeletedFalse(call.getId(), LookUpDataEntity.LookUpDataTypeEnum.EVALUATION_CRITERIA.getValue());
     }
 
     private CriteriaResponse buildCriteriaResponse(Long applicationId, EvaluationCriteriaEntity criteria) {
@@ -1207,7 +1212,8 @@ public class ApplicationEvaluationDao {
     List<ChecklistResponse> getChecklistResponse(Long applicationId) {
 
         CallEntity call = callRepository.findCallEntityByApplicationId(applicationId);
-        List<CallTargetAudienceChecklistEntity> checklistEntities = callTargetAudienceChecklistRepository.findByCallId(call.getId());
+        List<CallTargetAudienceChecklistEntity> checklistEntities =  callTargetAudienceChecklistRepository
+                .findByCallIdAndLookupDataTypeAndIsDeletedFalse(call.getId(), LookUpDataEntity.LookUpDataTypeEnum.CHECKLIST.getValue());
         List<ChecklistResponse> checklistResponses = checklistEntities.stream().map(checklist -> {
             ChecklistResponse response = new ChecklistResponse();
             response.setId(checklist.getId());
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/CallTargetAudienceChecklistRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/CallTargetAudienceChecklistRepository.java
index d092ea4a..95f58f8a 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/CallTargetAudienceChecklistRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/CallTargetAudienceChecklistRepository.java
@@ -12,10 +12,10 @@ import net.gepafin.tendermanagement.entities.CallTargetAudienceChecklistEntity;
 
 @Repository
 public interface CallTargetAudienceChecklistRepository extends JpaRepository<CallTargetAudienceChecklistEntity,Long> {
-	
+
 	@Query("SELECT c FROM CallTargetAudienceChecklistEntity c WHERE c.id = :id AND c.isDeleted = false")
 	Optional<CallTargetAudienceChecklistEntity> findById(@Param("id") Long id);
 
 	List<CallTargetAudienceChecklistEntity> findByCallIdAndLookupDataTypeAndIsDeletedFalse(Long id, String type);
-	List<CallTargetAudienceChecklistEntity> findByCallId(Long callId);
+//	List<CallTargetAudienceChecklistEntity> findByCallId(Long callId);
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/EvaluationCriteriaRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/EvaluationCriteriaRepository.java
index 8b25fc1f..1a7f7ccd 100644
--- a/src/main/java/net/gepafin/tendermanagement/repositories/EvaluationCriteriaRepository.java
+++ b/src/main/java/net/gepafin/tendermanagement/repositories/EvaluationCriteriaRepository.java
@@ -16,6 +16,6 @@ public interface EvaluationCriteriaRepository extends JpaRepository<EvaluationCr
 	Optional<EvaluationCriteriaEntity> findById(@Param("id") Long id);
 
 	List<EvaluationCriteriaEntity> findByCallIdAndLookupDataTypeAndIsDeletedFalse(Long callId, String type);
-	List<EvaluationCriteriaEntity> findByCallId(Long callId);
+//	List<EvaluationCriteriaEntity> findByCallId(Long callId);
 
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java
index 6ccee608..30cdaf80 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java
@@ -14,6 +14,7 @@ import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse
 
 import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository;
 import net.gepafin.tendermanagement.service.ApplicationEvaluationService;
+import net.gepafin.tendermanagement.service.AssignedApplicationsService;
 import net.gepafin.tendermanagement.util.Validator;
 import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
 import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
@@ -32,8 +33,9 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe
     @Autowired
     private Validator validator;
     @Autowired
+    private AssignedApplicationsService assignedApplicationsService;
+    @Autowired
     private AssignedApplicationsRepository assignedApplicationsRepository;
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ApplicationEvaluationResponse createOrUpdateApplicationEvaluation(
@@ -41,11 +43,7 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe
             ApplicationEvaluationRequest req,
             Long assignedApplicationsId) {
 
-        AssignedApplicationsEntity assignedApplication = assignedApplicationsRepository
-                .findByIdAndIsDeletedFalse(assignedApplicationsId)
-                .orElseThrow(() -> new ResourceNotFoundException(
-                        Status.NOT_FOUND,
-                        Translator.toLocale(GepafinConstant.ASSIGNED_APPLICATION_NOT_FOUND_MSG)));
+        AssignedApplicationsEntity assignedApplication =assignedApplicationsService.validateAssignedApplication(assignedApplicationsId);
 
         UserEntity user = validator.validatePreInstructor(request, assignedApplication.getUserId());