diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 3cf0386dfd91a32515217928491ca53e6044b766..5bc48bf160c7b28682207d264a7e570f44db59ff 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1686,7 +1686,7 @@
                 <name>GROUPCODEID</name>
                 <dbName></dbName>
                 <primaryKey v="false" />
-                <columnType v="1" />
+                <columnType v="12" />
                 <size v="36" />
                 <scale v="0" />
                 <notNull v="false" />
@@ -14925,6 +14925,20 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACT_ID</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="1" />
+                <size v="36" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
         </entities>
diff --git a/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js b/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
index 510afae5b2c0dfeb0451be8d4d176fc18bb6258c..3e2e63befe862a254f918262148b84b87d920816 100644
--- a/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
+++ b/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
@@ -7,6 +7,7 @@ import("KeywordRegistry_basic");
 var opentask = newSelect("count(TASKID)")
     .from("TASK")
     .where("TASK.STATUS", $KeywordRegistry.taskStatus$new())
+    .and ("TASK.KIND", "TASK")
     .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
     .cell();
     
diff --git a/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js b/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
index a143770f57c25f94eb6c9ca911e7956949522ad9..98e88dd15849effecdb68f06183c6aedd6498ac2 100644
--- a/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
+++ b/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
@@ -7,6 +7,7 @@ import("system.result");
 var overdueTaskCount = newSelect("count(TASKID)")
                     .from("TASK")
                     .where("TASK.MATURITY_DATE", "$sys.date", SqlBuilder.LESS())
+                    .and ("TASK.KIND", "TASK")
                     .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
                     .and("TASK.STATUS", TaskUtils.getEndedStatuses(), SqlBuilder.NOT_IN())
                     .cell()