diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
index c57307b4..86a19a42 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
@@ -800,18 +800,6 @@ public class CallDao {
 
 		List<CallEntity> calls = callRepository.findAll(spec);
 
-		if (Boolean.TRUE.equals(onlyPreferredCall)) {
-			validator.validateUserWithCompany(request, companyId);
-			UserWithCompanyEntity userWithCompanyEntity=companyService.getUserWithCompany(user.getId(),companyId);
-			List<BeneficiaryPreferredCallEntity> preferredCalls = beneficiaryPreferredCallRepository
-					.findByUserIdAndUserWithCompanyIdAndIsDeletedFalse(user.getId(), userWithCompanyEntity.getId());
-			List<Long> preferredCallIds = preferredCalls.stream()
-					.map(BeneficiaryPreferredCallEntity::getCallId)
-					.collect(Collectors.toList());
-			calls = callRepository.findByIdInAndStatusIn(preferredCallIds, callStatusList);
-		} else {
-			calls = callRepository.findByStatusInAndHubId(callStatusList, user.getHub().getId());
-		}
 		LocalDateTime now = LocalDateTime.now();
 		for (CallEntity call : calls) {
 			CallEntity oldCallEntity = Utils.getClonedEntityForData(call);
@@ -1156,8 +1144,9 @@ public class CallDao {
 			if (isConfidi.equals(Boolean.TRUE)) {
 				predicates.add(criteriaBuilder.isTrue(root.get("confidi")));
 			}
-		}
-		else if( Boolean.FALSE.equals(validator.checkIsConfidi()) && isConfidi!=null){
+		} else if (Boolean.TRUE.equals(validator.checkIsBeneficiary())) {
+			predicates.add(criteriaBuilder.isFalse(root.get("confidi")));
+		} else if( Boolean.FALSE.equals(validator.checkIsConfidi()) && isConfidi!=null){
 			if (isConfidi.equals(Boolean.TRUE)) {
 				predicates.add(criteriaBuilder.isTrue(root.get("confidi")));
 			}
@@ -1376,13 +1365,15 @@ public class CallDao {
 
 			if (validator.checkIsConfidi()) {
 				if (onlyConfidiCall==null || Boolean.FALSE.equals(onlyConfidiCall)) {
-					return criteriaBuilder.conjunction();
+					return criteriaBuilder.disjunction(); // Returns an empty predicate (no results)
 				}
 
 				if (onlyConfidiCall!=null && Boolean.TRUE.equals(onlyConfidiCall)) {
 					predicates.add(criteriaBuilder.isTrue(root.get("confidi")));
 				}
-			}else {
+			} else if (Boolean.TRUE.equals(validator.checkIsBeneficiary())) {
+				predicates.add(criteriaBuilder.isFalse(root.get("confidi")));
+			} else {
 				if(onlyConfidiCall!=null) {
 					if (Boolean.TRUE.equals(onlyConfidiCall)) {
 						predicates.add(criteriaBuilder.isTrue(root.get("confidi")));