diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index b5ebf375b211d4819d7a8865ffa277ec4f8e5e43..0d0a112f0c5bf19ba9ee893659b494b388606b3b 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -87,6 +87,12 @@
           <fieldName>Activities</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>262fe53d-7358-40ff-8641-e08add14528a</name>
+          <entityName>Object_entity</entityName>
+          <fieldName>Activities</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
     </entityProvider>
     <entityField>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index ea690ba4a943c3bc9b227d1ea0ca175678e403f2..2d1e2ff409dd15ec5a3c863503159b69ae385721 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -255,6 +255,22 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityConsumer>
+      <name>Activities</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Activity_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
+    <entityConsumer>
+      <name>Tasks</name>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Task_entity</entityName>
+        <fieldName>#PROVIDER</fieldName>
+      </dependency>
+    </entityConsumer>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index 959e539e3fa4fb174e0ed0f1e33c69860de603c2..67b5e68f5a12833bca63247bd9903b8d63e57f87 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -5,7 +5,7 @@ import("Context_lib");
 
 
 // NOTE THAT THIS ENTITY USES THE TARGET_CONSUMER_PROCESSES OF THE PROVIDERS
-// --> THIS PROCESS WON'T NOT BE EXECUTED IN SOME CASES.
+// --> THIS PROCESS WON'T BE EXECUTED IN SOME CASES.
 
 if (vars.get("$param.ObjectType_param"))
 {
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 28aaf1ff3a2235dee2c18623f6186cedb2503760..0be99b99ff62a5d371fa7c3147fcf23fa13fc07c 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -16,6 +16,14 @@
     <entityProvider>
       <name>#PROVIDER</name>
       <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>7a20f989-4c0a-40aa-9092-6ea9e99e851e</name>
+          <entityName>Object_entity</entityName>
+          <fieldName>Tasks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+      </dependencies>
     </entityProvider>
     <entityField>
       <name>SUBJECT</name>
diff --git a/entity/Task_entity/contentTitleProcess.js b/entity/Task_entity/contentTitleProcess.js
index 42200983cd942d93065d3728601f40eb2cc2d4ad..f52078612d802465f741fa89ea2baae0165c1e6b 100644
--- a/entity/Task_entity/contentTitleProcess.js
+++ b/entity/Task_entity/contentTitleProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.TYPE.displayValue"))
\ No newline at end of file
+result.string(vars.get("$field.SUBJECT"))
\ No newline at end of file
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 9baeb09edf427b03d69e758329ea5d8d7f715bd6..59bed651862041d08e72db34ad3256cab51d8acc 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -145,6 +145,10 @@ ContextUtils.getContextConsumer = function(pContextId)
             return "PrivatePersons";
         case ContextUtils.getContextName("Leadimport"):
             return "Leadimport";
+        case ContextUtils.getContextName("Task"):
+            return "Tasks";
+        case ContextUtils.getContextName("Activity"):
+            return "Activities";
         default:
             throw new Error(translate.withArguments("No consumer found for context '%0'", [pContextId]));
     }