diff --git a/persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/repository/EntityLogEntryDocumentRepository.java b/persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/repository/EntityLogEntryDocumentRepository.java
index 6a99fe797..b57549f7e 100644
--- a/persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/repository/EntityLogEntryDocumentRepository.java
+++ b/persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/repository/EntityLogEntryDocumentRepository.java
@@ -13,7 +13,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.mongo.document.En
 @Repository
 public interface EntityLogEntryDocumentRepository extends MongoRepository<EntityLogEntryDocument, String> {
 
-    @Query("{ 'entityLogId' : ?0, 'manualChanges' : { $exists: true, $not: { $size: 0 } } }")
+    @Query("{ 'entityLogId' : ?0, 'manualChanges' : { $exists: true, $ne: [] } }")
     List<EntityLogEntryDocument> findByEntityLogIdAndManualChangesNotEmpty(String entityLogId);
 
 
@@ -25,19 +25,19 @@ public interface EntityLogEntryDocumentRepository extends MongoRepository<Entity
     List<EntityLogEntryDocument> findByEntityLogId(String entityLogId);
 
 
-    @Query("{ 'entityLogId' : ?0, 'containingNodeId' : { $exists: true, $not: { $size: 0 } } }")
+    @Query("{ 'entityLogId' : ?0, 'containingNodeId' : { $exists: true, $ne: [] } }")
     List<EntityLogEntryDocument> findByEntityLogIdAndContainingNodeIdNotEmpty(String entityLogId);
 
 
-    @Query("{ 'entityLogId' : ?0 , 'containingNodeId' : { $exists: true, $eq: { $size: 0 } } }")
+    @Query("{ 'entityLogId' : ?0 , 'containingNodeId' : { $exists: true, $eq: [] } }")
     List<EntityLogEntryDocument> findByEntityLogIdAndContainingNodeIdEmpty(String entityLogId);
 
 
-    @Query(value = "{ 'id' : { $in: ?0 }, 'containingNodeId' : { $exists: true, $not: { $size: 0 } } }", fields = "{ 'containingNodeId': 1 }")
+    @Query(value = "{ 'id' : { $in: ?0 }, 'containingNodeId' : { $exists: true, $ne: [] } }", fields = "{ 'containingNodeId': 1 }")
     List<EntityLogEntryDocument> findContainingNodeIdForAllByIdAndContainingNodeIdNotEmpty(List<String> ids);
 
 
-    @Query("{ 'entityLogId' : ?0, $or: [ { 'containingNodeId' : { $exists: true, $eq: { $size: 0 } } }, { 'containingNodeId.0' : { $in: ?1 } } ] }")
+    @Query("{ 'entityLogId' : ?0, $or: [ { 'containingNodeId' : { $exists: true, $eq: [] } }, { 'containingNodeId.0' : { $in: ?1 } } ] }")
     List<EntityLogEntryDocument> findByEntityLogIdAndNotContainedOrFirstContainedByElementInList(String entityLogId, Collection<Integer> containingNodeIds);