diff --git a/src/main/java/it/pagopa/interop/signalhub/updater/cache/repository/ConsumerEServiceCacheRepository.java b/src/main/java/it/pagopa/interop/signalhub/updater/cache/repository/ConsumerEServiceCacheRepository.java
index 4541e0c..b4ae665 100644
--- a/src/main/java/it/pagopa/interop/signalhub/updater/cache/repository/ConsumerEServiceCacheRepository.java
+++ b/src/main/java/it/pagopa/interop/signalhub/updater/cache/repository/ConsumerEServiceCacheRepository.java
@@ -2,6 +2,7 @@
 
 
 import it.pagopa.interop.signalhub.updater.cache.model.ConsumerEServiceCache;
+import it.pagopa.interop.signalhub.updater.utility.CacheUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -16,17 +17,16 @@ public class ConsumerEServiceCacheRepository {
     @Qualifier("RedisTemplateConsumer")
     private RedisTemplate<String, ConsumerEServiceCache>  redisTemplate;
 
+
     public void updateConsumerEService(ConsumerEServiceCache item){
         Long index = this.findByEservice(item);
         if(index != null) {
-            redisTemplate.opsForList().set(item.getEserviceId().concat("-").concat(item.getConsumerId()), index, item);
+            redisTemplate.opsForList().set(CacheUtils.getCacheKey(item.getEserviceId(), item.getConsumerId()), index, item);
             log.info("Redis update OrganizationEService: {} ", item.getEserviceId());
         }
     }
 
     private Long findByEservice(ConsumerEServiceCache consumerEServiceCache) {
-        return redisTemplate.opsForList().indexOf(consumerEServiceCache.getEserviceId().concat("-").concat(consumerEServiceCache.getConsumerId()), consumerEServiceCache);
+        return redisTemplate.opsForList().indexOf(CacheUtils.getCacheKey(consumerEServiceCache.getEserviceId(), consumerEServiceCache.getConsumerId()), consumerEServiceCache);
     }
-
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/it/pagopa/interop/signalhub/updater/repository/TracingBatchRepository.java b/src/main/java/it/pagopa/interop/signalhub/updater/repository/TracingBatchRepository.java
index cc44c75..35a0a50 100644
--- a/src/main/java/it/pagopa/interop/signalhub/updater/repository/TracingBatchRepository.java
+++ b/src/main/java/it/pagopa/interop/signalhub/updater/repository/TracingBatchRepository.java
@@ -6,14 +6,13 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 
 @Repository
 public interface TracingBatchRepository extends JpaRepository<TracingBatchEntity, Long> {
     @Query("select trace from TracingBatchEntity trace where trace.lastEventId = (select MAX(t.lastEventId) from TracingBatchEntity t where t.type = :type) order by trace.tmstCreated desc" )
-    List<TracingBatchEntity> findByStateAndLastEventIdMaxAndType(String type);
+    List<TracingBatchEntity> findLatestByType(String type);
 
-    @Query("SELECT trace FROM TracingBatchEntity trace WHERE trace.state = :state AND trace.lastEventId = :lastEventId AND trace.type = :type")
-    List<TracingBatchEntity> findAllStateEndedWithErrorAndLastEventIdAndType(String state, Long lastEventId, String type);
+    @Query("SELECT trace FROM TracingBatchEntity trace WHERE trace.state = it.pagopa.interop.signalhub.updater.model.TracingBatchStateEnum.ENDED_WITH_ERROR AND trace.lastEventId = :lastEventId AND trace.type = :type")
+    List<TracingBatchEntity> findAllByStateEndedWithErrorAndLastEventIdAndType(Long lastEventId, String type);
 }
\ No newline at end of file