diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java
index dc074487c..22b3b46a2 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java
@@ -38,9 +38,9 @@ public class EntryPersistenceService {
     public void deleteEntries(String typeId, Set<String> values, long version, DictionaryEntryType dictionaryEntryType) {
 
         switch (dictionaryEntryType) {
-            case ENTRY -> entryRepository.deleteAllByTypeIdAndVersionAndValueIn(typeId, version, values);
-            case FALSE_POSITIVE -> falsePositiveEntryRepository.deleteAllByTypeIdAndVersionAndValueIn(typeId, version, values);
-            case FALSE_RECOMMENDATION -> falseRecommendationEntryRepository.deleteAllByTypeIdAndVersionAndValueIn(typeId, version, values);
+            case ENTRY -> entryRepository.deleteAllByTypeIdAndVersionAndValueIn(typeId, values, version);
+            case FALSE_POSITIVE -> falsePositiveEntryRepository.deleteAllByTypeIdAndVersionAndValueIn(typeId, values, version);
+            case FALSE_RECOMMENDATION -> falseRecommendationEntryRepository.deleteAllByTypeIdAndVersionAndValueIn(typeId, values, version);
         }
     }
 
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/EntryRepositoryCustom.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/EntryRepositoryCustom.java
index 08f494c7d..5acdb298b 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/EntryRepositoryCustom.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/EntryRepositoryCustom.java
@@ -8,6 +8,6 @@ public interface EntryRepositoryCustom {
     List<String> undeleteEntries(String typeId, Set<String> entries, long version);
 
 
-    void deleteAllByTypeIdAndVersionAndValueIn(String typeId, long version, Set<String> entries);
+    void deleteAllByTypeIdAndVersionAndValueIn(String typeId, Set<String> entries, long version);
 
 }
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/EntryRepositoryImpl.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/EntryRepositoryImpl.java
index 2e29d9336..7e9634343 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/EntryRepositoryImpl.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/EntryRepositoryImpl.java
@@ -27,9 +27,9 @@ public class EntryRepositoryImpl implements EntryRepositoryCustom {
 
 
     @Override
-    public void deleteAllByTypeIdAndVersionAndValueIn(String typeId, long version, Set<String> entries) {
+    public void deleteAllByTypeIdAndVersionAndValueIn(String typeId, Set<String> entries, long version) {
 
-        queryExecutor.runDeleteQueryInBatches(typeId, version, entries, TABLE_NAME);
+        queryExecutor.runDeleteQueryInBatches(typeId, entries, version, TABLE_NAME);
     }
 
 }
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalsePositiveEntryRepositoryCustom.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalsePositiveEntryRepositoryCustom.java
index 22422f0b4..06dd48b91 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalsePositiveEntryRepositoryCustom.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalsePositiveEntryRepositoryCustom.java
@@ -8,6 +8,6 @@ public interface FalsePositiveEntryRepositoryCustom {
     List<String> undeleteEntries(String typeId, Set<String> entries, long version);
 
 
-    void deleteAllByTypeIdAndVersionAndValueIn(String typeId, long version, Set<String> entries);
+    void deleteAllByTypeIdAndVersionAndValueIn(String typeId, Set<String> entries, long version);
 
 }
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalsePositiveEntryRepositoryImpl.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalsePositiveEntryRepositoryImpl.java
index fbe374e41..c2c6035a2 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalsePositiveEntryRepositoryImpl.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalsePositiveEntryRepositoryImpl.java
@@ -27,9 +27,9 @@ class FalsePositiveEntryRepositoryImpl implements FalsePositiveEntryRepositoryCu
 
 
     @Override
-    public void deleteAllByTypeIdAndVersionAndValueIn(String typeId, long version, Set<String> entries) {
+    public void deleteAllByTypeIdAndVersionAndValueIn(String typeId, Set<String> entries, long version) {
 
-        queryExecutor.runDeleteQueryInBatches(typeId, version, entries, TABLE_NAME);
+        queryExecutor.runDeleteQueryInBatches(typeId, entries, version, TABLE_NAME);
     }
 
 }
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalseRecommendationEntryRepositoryCustom.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalseRecommendationEntryRepositoryCustom.java
index fc99c5037..adc92c1ed 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalseRecommendationEntryRepositoryCustom.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalseRecommendationEntryRepositoryCustom.java
@@ -8,6 +8,6 @@ public interface FalseRecommendationEntryRepositoryCustom {
     List<String> undeleteEntries(String typeId, Set<String> entries, long version);
 
 
-    void deleteAllByTypeIdAndVersionAndValueIn(String typeId, long version, Set<String> entries);
+    void deleteAllByTypeIdAndVersionAndValueIn(String typeId, Set<String> entries, long version);
 
 }
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalseRecommendationEntryRepositoryImpl.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalseRecommendationEntryRepositoryImpl.java
index 23cef02ed..be3d908c7 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalseRecommendationEntryRepositoryImpl.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/FalseRecommendationEntryRepositoryImpl.java
@@ -27,9 +27,9 @@ class FalseRecommendationEntryRepositoryImpl implements FalseRecommendationEntry
 
 
     @Override
-    public void deleteAllByTypeIdAndVersionAndValueIn(String typeId, long version, Set<String> entries) {
+    public void deleteAllByTypeIdAndVersionAndValueIn(String typeId, Set<String> entries, long version) {
 
-        queryExecutor.runDeleteQueryInBatches(typeId, version, entries, TABLE_NAME);
+        queryExecutor.runDeleteQueryInBatches(typeId, entries, version, TABLE_NAME);
     }
 
 }
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/QueryExecutor.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/QueryExecutor.java
index 87c1bd50a..2f4d96f37 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/QueryExecutor.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/dictionaryentry/QueryExecutor.java
@@ -116,7 +116,7 @@ class QueryExecutor {
 
 
     @Transactional
-    public void runDeleteQueryInBatches(String typeId, long version, Set<String> entries, String tableName) {
+    public void runDeleteQueryInBatches(String typeId, Set<String> entries, long version, String tableName) {
 
         runUpdateQueryInBatches(typeId, entries, version, tableName, true, false);
     }