diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 8d1f8c7048a5dbf2e54d0213c01465d38cbe0fbc..cd65065c38663b5ab510ec227d4807fbf1260f4d 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -58,6 +58,7 @@
     </entityParameter>
     <entityField>
       <name>SUBJECT_DETAILS</name>
+      <linkedContext>Activity</linkedContext>
       <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/subject_details/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 5a6394af6a270b012f70e4325dd0bf2410126902..370f210a8fd53d25f1f55b93cb6f94af250d0fbf 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -25,6 +25,7 @@
     <entityField>
       <name>SUBJECT</name>
       <title>subject</title>
+      <linkedContext>Task</linkedContext>
       <mandatory v="true" />
     </entityField>
     <entityField>