diff --git a/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow.hpl b/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow.hpl
index a80b34e..fbffb7c 100644
--- a/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow.hpl
@@ -235,6 +235,24 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
       <yloc>320</yloc>
     </GUI>
   </transform>
+  <transform>
+    <name>Identify last row in a stream</name>
+    <type>DetectLastRow</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <resultfieldname>last_row</resultfieldname>
+    <attributes/>
+    <GUI>
+      <xloc>640</xloc>
+      <yloc>320</yloc>
+    </GUI>
+  </transform>
   <transform>
     <name>Table input</name>
     <type>TableInput</type>
@@ -248,6 +266,7 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
+    <limit/>
     <sql>SELECT
     ri.recruit_id::uuid,
     MAX(CASE WHEN addr->>'type' = 'actualAddress' THEN addr->>'reg' END) AS residence_address,
@@ -271,6 +290,7 @@ FROM ervu_dashboard.recruits_info ri
 WHERE
  '${IDM_ID}' != ''
   AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
+  AND'${M_R_CR_DATE}'::timestamp >= c.recruit_create_date
 GROUP BY ri.recruit_id;</sql>
     <variables_active>Y</variables_active>
     <attributes/>
@@ -357,24 +377,6 @@ GROUP BY ri.recruit_id;</sql>
       <yloc>320</yloc>
     </GUI>
   </transform>
-  <transform>
-    <name>Identify last row in a stream</name>
-    <type>DetectLastRow</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <resultfieldname>last_row</resultfieldname>
-    <attributes/>
-    <GUI>
-      <xloc>640</xloc>
-      <yloc>320</yloc>
-    </GUI>
-  </transform>
   <transform_error_handling>
     <error>
       <source_transform>Table output</source_transform>
diff --git a/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_delta.hpl b/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_delta.hpl
index ca6b9a8..262fee7 100644
--- a/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_delta.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_delta.hpl
@@ -274,7 +274,6 @@ and recruitment_id = '${IDM_ID}';</sql>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
-        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen_address</table>
@@ -354,6 +353,7 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
+    <limit/>
     <sql>SELECT
     ri.recruit_id::uuid,
     MAX(CASE WHEN addr->>'type' = 'actualAddress' THEN addr->>'reg' END) AS residence_address,
@@ -377,6 +377,8 @@ FROM ervu_dashboard.recruits_info ri
 WHERE
  '${IDM_ID}' != ''
   AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
+  AND'${M_R_CR_DATE}'::timestamp >= c.recruit_create_date
+  AND c.update_date >= '${M_R_UP_DATE}'::timestamp
 GROUP BY ri.recruit_id;</sql>
     <variables_active>Y</variables_active>
     <attributes/>
diff --git a/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_repeat.hpl
index 1d0bf43..6722b66 100644
--- a/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_address/parallel/citizen_address_flow_repeat.hpl
@@ -288,7 +288,6 @@ DO UPDATE SET
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
-        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen_address</table>
@@ -368,6 +367,7 @@ DO UPDATE SET
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
+    <limit/>
     <sql>SELECT
     ri.recruit_id::uuid,
     MAX(CASE WHEN addr->>'type' = 'actualAddress' THEN addr->>'reg' END) AS residence_address,
@@ -391,6 +391,7 @@ FROM ervu_dashboard.recruits_info ri
 WHERE
  '${IDM_ID}' != ''
   AND COALESCE(ri.current_recruitment_id, ri.target_recruitment_id) = '${IDM_ID}'
+  AND'${M_R_CR_DATE}'::timestamp >= c.recruit_create_date
 GROUP BY ri.recruit_id;</sql>
     <variables_active>Y</variables_active>
     <attributes/>