diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/AnnotationQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/AnnotationQuery.java
index 90b83f788..76546c9e4 100644
--- a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/AnnotationQuery.java
+++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/AnnotationQuery.java
@@ -180,7 +180,7 @@ public class AnnotationQuery extends QueryBase<AnnotationEntity> {
     }
 
     public AnnotationQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/EntityUserQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/EntityUserQuery.java
index c21138867..0b30dfda2 100644
--- a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/EntityUserQuery.java
+++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/EntityUserQuery.java
@@ -113,7 +113,7 @@ public class EntityUserQuery extends QueryBase<EntityUserEntity> {
     }
 
     public EntityUserQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueInboxQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueInboxQuery.java
index b96a1be0a..a525c2840 100644
--- a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueInboxQuery.java
+++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueInboxQuery.java
@@ -126,7 +126,7 @@ public class QueueInboxQuery extends QueryBase<QueueInboxEntity> {
 	}
 
 	public QueueInboxQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 
diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueOutboxQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueOutboxQuery.java
index 58d4d2cfe..e4d100e95 100644
--- a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueOutboxQuery.java
+++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/QueueOutboxQuery.java
@@ -131,7 +131,7 @@ public class QueueOutboxQuery extends QueryBase<QueueOutboxEntity> {
 	}
 
 	public QueueOutboxQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 
diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantQuery.java
index 1f3aaa200..7e85d0c56 100644
--- a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantQuery.java
+++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantQuery.java
@@ -74,7 +74,7 @@ public class TenantQuery extends QueryBase<TenantEntity> {
     }
 
     public TenantQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantUserQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantUserQuery.java
index 5f78245bd..3730c57eb 100644
--- a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantUserQuery.java
+++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/TenantUserQuery.java
@@ -120,7 +120,7 @@ public class TenantUserQuery extends QueryBase<TenantUserEntity> {
 	}
 
 	public TenantUserQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 
diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserCredentialQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserCredentialQuery.java
index c4e55a1ee..ba8bd1105 100644
--- a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserCredentialQuery.java
+++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserCredentialQuery.java
@@ -131,7 +131,7 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
     }
 
     public UserCredentialQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserQuery.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserQuery.java
index 7d81d9863..5c82f0735 100644
--- a/annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserQuery.java
+++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserQuery.java
@@ -90,7 +90,7 @@ public class UserQuery extends QueryBase<UserEntity> {
     }
 
     public UserQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/ActionConfirmationQuery.java b/backend/core/src/main/java/org/opencdmp/query/ActionConfirmationQuery.java
index bdff573af..9f1829ace 100644
--- a/backend/core/src/main/java/org/opencdmp/query/ActionConfirmationQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/ActionConfirmationQuery.java
@@ -164,7 +164,7 @@ public class ActionConfirmationQuery extends QueryBase<ActionConfirmationEntity>
     }
 
     public ActionConfirmationQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/DescriptionQuery.java b/backend/core/src/main/java/org/opencdmp/query/DescriptionQuery.java
index 76dac5db4..7e6e131cf 100644
--- a/backend/core/src/main/java/org/opencdmp/query/DescriptionQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/DescriptionQuery.java
@@ -217,7 +217,7 @@ public class DescriptionQuery extends QueryBase<DescriptionEntity> {
     }
 
     public DescriptionQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/DescriptionReferenceQuery.java b/backend/core/src/main/java/org/opencdmp/query/DescriptionReferenceQuery.java
index 600ca21b8..7c17660bc 100644
--- a/backend/core/src/main/java/org/opencdmp/query/DescriptionReferenceQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/DescriptionReferenceQuery.java
@@ -132,7 +132,7 @@ public class DescriptionReferenceQuery extends QueryBase<DescriptionReferenceEnt
     }
 
     public DescriptionReferenceQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/DescriptionTagQuery.java b/backend/core/src/main/java/org/opencdmp/query/DescriptionTagQuery.java
index f8181775a..324c95eb1 100644
--- a/backend/core/src/main/java/org/opencdmp/query/DescriptionTagQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/DescriptionTagQuery.java
@@ -121,7 +121,7 @@ public class DescriptionTagQuery extends QueryBase<DescriptionTagEntity> {
     }
 
     public DescriptionTagQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
     
diff --git a/backend/core/src/main/java/org/opencdmp/query/DescriptionTemplateQuery.java b/backend/core/src/main/java/org/opencdmp/query/DescriptionTemplateQuery.java
index f8359d3cd..a1b6ad4aa 100644
--- a/backend/core/src/main/java/org/opencdmp/query/DescriptionTemplateQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/DescriptionTemplateQuery.java
@@ -218,7 +218,7 @@ public class DescriptionTemplateQuery extends QueryBase<DescriptionTemplateEntit
     }
 
     public DescriptionTemplateQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/DescriptionTemplateTypeQuery.java b/backend/core/src/main/java/org/opencdmp/query/DescriptionTemplateTypeQuery.java
index 40b3f8039..03c13ac27 100644
--- a/backend/core/src/main/java/org/opencdmp/query/DescriptionTemplateTypeQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/DescriptionTemplateTypeQuery.java
@@ -111,7 +111,7 @@ public class DescriptionTemplateTypeQuery extends QueryBase<DescriptionTemplateT
     }
 
     public DescriptionTemplateTypeQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/DmpBlueprintQuery.java b/backend/core/src/main/java/org/opencdmp/query/DmpBlueprintQuery.java
index 290f82f7b..88bce1894 100644
--- a/backend/core/src/main/java/org/opencdmp/query/DmpBlueprintQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/DmpBlueprintQuery.java
@@ -164,7 +164,7 @@ public class DmpBlueprintQuery extends QueryBase<DmpBlueprintEntity> {
     }
 
     public DmpBlueprintQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/DmpDescriptionTemplateQuery.java b/backend/core/src/main/java/org/opencdmp/query/DmpDescriptionTemplateQuery.java
index b557b8423..5c8346daa 100644
--- a/backend/core/src/main/java/org/opencdmp/query/DmpDescriptionTemplateQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/DmpDescriptionTemplateQuery.java
@@ -156,7 +156,7 @@ public class DmpDescriptionTemplateQuery extends QueryBase<DmpDescriptionTemplat
     }
 
     public DmpDescriptionTemplateQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/DmpQuery.java b/backend/core/src/main/java/org/opencdmp/query/DmpQuery.java
index 2f65125cb..6d35f6e2a 100644
--- a/backend/core/src/main/java/org/opencdmp/query/DmpQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/DmpQuery.java
@@ -247,7 +247,7 @@ public class DmpQuery extends QueryBase<DmpEntity> {
     }
 
     public DmpQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/DmpReferenceQuery.java b/backend/core/src/main/java/org/opencdmp/query/DmpReferenceQuery.java
index cfe0add0f..764077ff1 100644
--- a/backend/core/src/main/java/org/opencdmp/query/DmpReferenceQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/DmpReferenceQuery.java
@@ -122,7 +122,7 @@ public class DmpReferenceQuery extends QueryBase<DmpReferenceEntity> {
     }
 
     public DmpReferenceQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/DmpUserQuery.java b/backend/core/src/main/java/org/opencdmp/query/DmpUserQuery.java
index cc49de8cf..821e92b52 100644
--- a/backend/core/src/main/java/org/opencdmp/query/DmpUserQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/DmpUserQuery.java
@@ -168,7 +168,7 @@ public class DmpUserQuery extends QueryBase<DmpUserEntity> {
     }
 
     public DmpUserQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/EntityDoiQuery.java b/backend/core/src/main/java/org/opencdmp/query/EntityDoiQuery.java
index 1d02cd234..353724b72 100644
--- a/backend/core/src/main/java/org/opencdmp/query/EntityDoiQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/EntityDoiQuery.java
@@ -166,7 +166,7 @@ public class EntityDoiQuery extends QueryBase<EntityDoiEntity> {
     }
 
     public EntityDoiQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/LanguageQuery.java b/backend/core/src/main/java/org/opencdmp/query/LanguageQuery.java
index 686168a06..ef7734448 100644
--- a/backend/core/src/main/java/org/opencdmp/query/LanguageQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/LanguageQuery.java
@@ -110,7 +110,7 @@ public class LanguageQuery extends QueryBase<LanguageEntity> {
     }
 
     public LanguageQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/LockQuery.java b/backend/core/src/main/java/org/opencdmp/query/LockQuery.java
index e493137a5..1c2010f39 100644
--- a/backend/core/src/main/java/org/opencdmp/query/LockQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/LockQuery.java
@@ -144,7 +144,7 @@ public class LockQuery extends QueryBase<LockEntity> {
     }
 
     public LockQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/PrefillingSourceQuery.java b/backend/core/src/main/java/org/opencdmp/query/PrefillingSourceQuery.java
index 1f49ce540..a6db5a2bc 100644
--- a/backend/core/src/main/java/org/opencdmp/query/PrefillingSourceQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/PrefillingSourceQuery.java
@@ -93,7 +93,7 @@ public class PrefillingSourceQuery extends QueryBase<PrefillingSourceEntity> {
     }
 
     public PrefillingSourceQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/QueueInboxQuery.java b/backend/core/src/main/java/org/opencdmp/query/QueueInboxQuery.java
index 06392b4e7..e06ba580c 100644
--- a/backend/core/src/main/java/org/opencdmp/query/QueueInboxQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/QueueInboxQuery.java
@@ -126,7 +126,7 @@ public class QueueInboxQuery extends QueryBase<QueueInboxEntity> {
 	}
 
 	public QueueInboxQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/QueueOutboxQuery.java b/backend/core/src/main/java/org/opencdmp/query/QueueOutboxQuery.java
index 2da172406..8eafb9797 100644
--- a/backend/core/src/main/java/org/opencdmp/query/QueueOutboxQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/QueueOutboxQuery.java
@@ -132,7 +132,7 @@ public class QueueOutboxQuery extends QueryBase<QueueOutboxEntity> {
 	}
 
 	public QueueOutboxQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java b/backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java
index 457e2990c..d0732c9df 100644
--- a/backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java
@@ -184,7 +184,7 @@ public class ReferenceQuery extends QueryBase<ReferenceEntity> {
     }
 
     public ReferenceQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/ReferenceTypeQuery.java b/backend/core/src/main/java/org/opencdmp/query/ReferenceTypeQuery.java
index 4a7f96e2b..b23487ba1 100644
--- a/backend/core/src/main/java/org/opencdmp/query/ReferenceTypeQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/ReferenceTypeQuery.java
@@ -111,7 +111,7 @@ public class ReferenceTypeQuery extends QueryBase<ReferenceTypeEntity> {
     }
 
     public ReferenceTypeQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/StorageFileQuery.java b/backend/core/src/main/java/org/opencdmp/query/StorageFileQuery.java
index 39710ab48..2f8b40b1b 100644
--- a/backend/core/src/main/java/org/opencdmp/query/StorageFileQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/StorageFileQuery.java
@@ -118,7 +118,7 @@ public class StorageFileQuery extends QueryBase<StorageFileEntity> {
     }
 
     public StorageFileQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/SupportiveMaterialQuery.java b/backend/core/src/main/java/org/opencdmp/query/SupportiveMaterialQuery.java
index c42c2b05e..ecdd720ea 100644
--- a/backend/core/src/main/java/org/opencdmp/query/SupportiveMaterialQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/SupportiveMaterialQuery.java
@@ -128,7 +128,7 @@ public class SupportiveMaterialQuery extends QueryBase<SupportiveMaterialEntity>
     }
 
     public SupportiveMaterialQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/TagQuery.java b/backend/core/src/main/java/org/opencdmp/query/TagQuery.java
index c02bd1ef6..465c53b2f 100644
--- a/backend/core/src/main/java/org/opencdmp/query/TagQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/TagQuery.java
@@ -164,7 +164,7 @@ public class TagQuery extends QueryBase<TagEntity> {
     }
 
     public TagQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/TenantConfigurationQuery.java b/backend/core/src/main/java/org/opencdmp/query/TenantConfigurationQuery.java
index fbe519090..f32a2c14e 100644
--- a/backend/core/src/main/java/org/opencdmp/query/TenantConfigurationQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/TenantConfigurationQuery.java
@@ -126,7 +126,7 @@ public class TenantConfigurationQuery extends QueryBase<TenantConfigurationEntit
     }
 
     public TenantConfigurationQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/TenantQuery.java b/backend/core/src/main/java/org/opencdmp/query/TenantQuery.java
index 12f3265b9..94addfc20 100644
--- a/backend/core/src/main/java/org/opencdmp/query/TenantQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/TenantQuery.java
@@ -113,7 +113,7 @@ public class TenantQuery extends QueryBase<TenantEntity> {
     }
 
     public TenantQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/TenantUserQuery.java b/backend/core/src/main/java/org/opencdmp/query/TenantUserQuery.java
index aa69fe576..79d7f5b29 100644
--- a/backend/core/src/main/java/org/opencdmp/query/TenantUserQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/TenantUserQuery.java
@@ -118,7 +118,7 @@ public class TenantUserQuery extends QueryBase<TenantUserEntity> {
 	}
 
 	public TenantUserQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/UserContactInfoQuery.java b/backend/core/src/main/java/org/opencdmp/query/UserContactInfoQuery.java
index 9a4f46803..ca0e6419c 100644
--- a/backend/core/src/main/java/org/opencdmp/query/UserContactInfoQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/UserContactInfoQuery.java
@@ -139,7 +139,7 @@ public class UserContactInfoQuery extends QueryBase<UserContactInfoEntity> {
     }
 
     public UserContactInfoQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/UserCredentialQuery.java b/backend/core/src/main/java/org/opencdmp/query/UserCredentialQuery.java
index 3da2927d5..55ca85578 100644
--- a/backend/core/src/main/java/org/opencdmp/query/UserCredentialQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/UserCredentialQuery.java
@@ -102,7 +102,7 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
     }
 
     public UserCredentialQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/UserDescriptionTemplateQuery.java b/backend/core/src/main/java/org/opencdmp/query/UserDescriptionTemplateQuery.java
index 0e15e9753..6e6f738f0 100644
--- a/backend/core/src/main/java/org/opencdmp/query/UserDescriptionTemplateQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/UserDescriptionTemplateQuery.java
@@ -127,7 +127,7 @@ public class UserDescriptionTemplateQuery extends QueryBase<UserDescriptionTempl
     }
 
     public UserDescriptionTemplateQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/UserQuery.java b/backend/core/src/main/java/org/opencdmp/query/UserQuery.java
index 32ee7f2dc..618bf7010 100644
--- a/backend/core/src/main/java/org/opencdmp/query/UserQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/UserQuery.java
@@ -131,7 +131,7 @@ public class UserQuery extends QueryBase<UserEntity> {
     }
 
     public UserQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/UserRoleQuery.java b/backend/core/src/main/java/org/opencdmp/query/UserRoleQuery.java
index 758f43fed..96852d2f6 100644
--- a/backend/core/src/main/java/org/opencdmp/query/UserRoleQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/UserRoleQuery.java
@@ -129,7 +129,7 @@ public class UserRoleQuery extends QueryBase<UserRoleEntity> {
     }
 
     public UserRoleQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/backend/core/src/main/java/org/opencdmp/query/UserSettingsQuery.java b/backend/core/src/main/java/org/opencdmp/query/UserSettingsQuery.java
index efc058b7f..e1758be3a 100644
--- a/backend/core/src/main/java/org/opencdmp/query/UserSettingsQuery.java
+++ b/backend/core/src/main/java/org/opencdmp/query/UserSettingsQuery.java
@@ -133,7 +133,7 @@ public class UserSettingsQuery extends QueryBase<UserSettingsEntity> {
 	}
 
 	public UserSettingsQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 
diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts b/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts
index 634a975b5..69a1df5be 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts
+++ b/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts
@@ -75,7 +75,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 
 	pageToFieldSetMap: Map<string, DescriptionFieldIndicator[]> = new Map<string, DescriptionFieldIndicator[]>();
 
-	private initialTemplateId: Guid;
+	private initialTemplateId: string = Guid.EMPTY;
 
 	constructor(
 		// BaseFormEditor injected dependencies
@@ -190,7 +190,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 		try {
 			this.editorModel = data ? new DescriptionEditorModel().fromModel(data, data.descriptionTemplate) : new DescriptionEditorModel();
 			this.item = data;
-			this.initialTemplateId = data.descriptionTemplate.id;
+			this.initialTemplateId = data?.descriptionTemplate?.id?.toString();
 			if (data && data.dmpDescriptionTemplate?.sectionId && data.dmp?.blueprint?.definition?.sections?.length > 0 && data.dmp?.descriptions?.length > 0) {
 				const section = data.dmp?.blueprint?.definition?.sections.find(x => x.id == data.dmpDescriptionTemplate?.sectionId);
 				if (section.hasTemplates) {
@@ -663,7 +663,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 			.pipe(takeUntil(this._destroyed))
 			.subscribe(descriptionTemplateId => {
 				if (descriptionTemplateId) {
-					if (descriptionTemplateId === this.initialTemplateId) return;
+					if (this.initialTemplateId && this.initialTemplateId != '' && descriptionTemplateId === this.initialTemplateId) return;
 					this.descriptionTemplateValueChanged(descriptionTemplateId);
 				}
 			});
@@ -679,7 +679,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 			this.descriptionTemplateService.getSingle(descriptionTemplateId, DescriptionEditorResolver.descriptionTemplateLookupFields()).pipe(takeUntil(this._destroyed))
 			.subscribe(descriptionTemplate => {
 
-				this.initialTemplateId = descriptionTemplateId;
+				this.initialTemplateId = descriptionTemplateId.toString();
 				this.editorModel.properties = new DescriptionPropertyDefinitionEditorModel(this.editorModel.validationErrorModel).fromModel(null, descriptionTemplate, null);
 				this.formGroup.setControl('properties', this.editorModel.buildProperties());
 				this.item.descriptionTemplate = descriptionTemplate;
@@ -693,7 +693,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 				this.registerFormListeners();
 			},
 			error => {
-				this.formGroup.get('descriptionTemplateId').setValue(this.initialTemplateId);
+				this.formGroup.get('descriptionTemplateId').setValue(this.initialTemplateId && this.initialTemplateId != '' ? this.initialTemplateId : null);
 				this.httpErrorHandlingService.handleBackedRequestError(error);
 			});
 		}
diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/InAppNotificationQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/InAppNotificationQuery.java
index 1e0df1e55..8f6ae68cd 100644
--- a/notification-service/notification/src/main/java/gr/cite/notification/query/InAppNotificationQuery.java
+++ b/notification-service/notification/src/main/java/gr/cite/notification/query/InAppNotificationQuery.java
@@ -162,7 +162,7 @@ public class InAppNotificationQuery extends QueryBase<InAppNotificationEntity> {
     }
 
     public InAppNotificationQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationQuery.java
index 4918e5ea6..037f28fde 100644
--- a/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationQuery.java
+++ b/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationQuery.java
@@ -212,7 +212,7 @@ public class NotificationQuery extends QueryBase<NotificationEntity> {
     }
 
     public NotificationQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationTemplateQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationTemplateQuery.java
index 439a0d808..02b416f2c 100644
--- a/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationTemplateQuery.java
+++ b/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationTemplateQuery.java
@@ -151,7 +151,7 @@ public class NotificationTemplateQuery extends QueryBase<NotificationTemplateEnt
 	}
 
 	public NotificationTemplateQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 
diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/QueueInboxQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/QueueInboxQuery.java
index 198163bb8..d154f8a55 100644
--- a/notification-service/notification/src/main/java/gr/cite/notification/query/QueueInboxQuery.java
+++ b/notification-service/notification/src/main/java/gr/cite/notification/query/QueueInboxQuery.java
@@ -126,7 +126,7 @@ public class QueueInboxQuery extends QueryBase<QueueInboxEntity> {
 	}
 
 	public QueueInboxQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 
diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/QueueOutboxQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/QueueOutboxQuery.java
index c21d73326..5b98fbd13 100644
--- a/notification-service/notification/src/main/java/gr/cite/notification/query/QueueOutboxQuery.java
+++ b/notification-service/notification/src/main/java/gr/cite/notification/query/QueueOutboxQuery.java
@@ -132,7 +132,7 @@ public class QueueOutboxQuery extends QueryBase<QueueOutboxEntity> {
 	}
 
 	public QueueOutboxQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 
diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/TenantConfigurationQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/TenantConfigurationQuery.java
index ef2f3bacf..2fb21fed7 100644
--- a/notification-service/notification/src/main/java/gr/cite/notification/query/TenantConfigurationQuery.java
+++ b/notification-service/notification/src/main/java/gr/cite/notification/query/TenantConfigurationQuery.java
@@ -125,7 +125,7 @@ public class TenantConfigurationQuery extends QueryBase<TenantConfigurationEntit
     }
 
     public TenantConfigurationQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/TenantQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/TenantQuery.java
index e35cb490a..6bd67ca55 100644
--- a/notification-service/notification/src/main/java/gr/cite/notification/query/TenantQuery.java
+++ b/notification-service/notification/src/main/java/gr/cite/notification/query/TenantQuery.java
@@ -69,7 +69,7 @@ public class TenantQuery extends QueryBase<TenantEntity> {
     }
 
     public TenantQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/TenantUserQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/TenantUserQuery.java
index 0f5a24167..0ff7c1d0d 100644
--- a/notification-service/notification/src/main/java/gr/cite/notification/query/TenantUserQuery.java
+++ b/notification-service/notification/src/main/java/gr/cite/notification/query/TenantUserQuery.java
@@ -120,7 +120,7 @@ public class TenantUserQuery extends QueryBase<TenantUserEntity> {
 	}
 
 	public TenantUserQuery disableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 
diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/UserContactInfoQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/UserContactInfoQuery.java
index 725a0d7ac..920dd5fb8 100644
--- a/notification-service/notification/src/main/java/gr/cite/notification/query/UserContactInfoQuery.java
+++ b/notification-service/notification/src/main/java/gr/cite/notification/query/UserContactInfoQuery.java
@@ -160,7 +160,7 @@ public class UserContactInfoQuery extends QueryBase<UserContactInfoEntity> {
     }
 
     public UserContactInfoQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/UserCredentialQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/UserCredentialQuery.java
index 59f93f1be..d4f800873 100644
--- a/notification-service/notification/src/main/java/gr/cite/notification/query/UserCredentialQuery.java
+++ b/notification-service/notification/src/main/java/gr/cite/notification/query/UserCredentialQuery.java
@@ -114,7 +114,7 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
     }
 
     public UserCredentialQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/UserNotificationPreferenceQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/UserNotificationPreferenceQuery.java
index 7b27218d8..3a31e03b0 100644
--- a/notification-service/notification/src/main/java/gr/cite/notification/query/UserNotificationPreferenceQuery.java
+++ b/notification-service/notification/src/main/java/gr/cite/notification/query/UserNotificationPreferenceQuery.java
@@ -133,7 +133,7 @@ public class UserNotificationPreferenceQuery extends QueryBase<UserNotificationP
     }
 
     public UserNotificationPreferenceQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }
 
diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/UserQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/UserQuery.java
index d5b80d3e3..21466d9af 100644
--- a/notification-service/notification/src/main/java/gr/cite/notification/query/UserQuery.java
+++ b/notification-service/notification/src/main/java/gr/cite/notification/query/UserQuery.java
@@ -83,7 +83,7 @@ public class UserQuery extends QueryBase<UserEntity> {
 
 
 	public UserQuery enableTracking() {
-		this.noTracking = false;
+		this.noTracking = true;
 		return this;
 	}
 
diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/UserRoleQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/UserRoleQuery.java
index 4e41d4744..bbfa8685d 100644
--- a/notification-service/notification/src/main/java/gr/cite/notification/query/UserRoleQuery.java
+++ b/notification-service/notification/src/main/java/gr/cite/notification/query/UserRoleQuery.java
@@ -131,7 +131,7 @@ public class UserRoleQuery extends QueryBase<UserRoleEntity> {
     }
 
     public UserRoleQuery disableTracking() {
-        this.noTracking = false;
+        this.noTracking = true;
         return this;
     }