diff --git a/mappings/info_recruits/citizen_tables/child/parallel/child_flow.hpl b/mappings/info_recruits/citizen_tables/child/parallel/child_flow.hpl
index 5ea7327..4450844 100644
--- a/mappings/info_recruits/citizen_tables/child/parallel/child_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/child/parallel/child_flow.hpl
@@ -310,7 +310,6 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <limit/>
     <sql>WITH children_data AS (
     SELECT
         ri.recruit_id AS recruit_id,
@@ -468,11 +467,13 @@ FROM children_data;</sql>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
     <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
diff --git a/mappings/info_recruits/citizen_tables/child/parallel/child_flow_delta.hpl b/mappings/info_recruits/citizen_tables/child/parallel/child_flow_delta.hpl
index 742e83a..3ed095c 100644
--- a/mappings/info_recruits/citizen_tables/child/parallel/child_flow_delta.hpl
+++ b/mappings/info_recruits/citizen_tables/child/parallel/child_flow_delta.hpl
@@ -406,7 +406,6 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <limit/>
     <sql>WITH children_data AS (
     SELECT
         ri.recruit_id AS recruit_id,
@@ -483,11 +482,13 @@ FROM children_data;</sql>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
     <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
diff --git a/mappings/info_recruits/citizen_tables/child/parallel/child_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/child/parallel/child_flow_repeat.hpl
index d568245..e761671 100644
--- a/mappings/info_recruits/citizen_tables/child/parallel/child_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/child/parallel/child_flow_repeat.hpl
@@ -497,11 +497,13 @@ FROM children_data;</sql>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
     <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
diff --git a/mappings/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow.hpl b/mappings/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow.hpl
index 6ecf15b..0e5a74d 100644
--- a/mappings/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow.hpl
@@ -418,16 +418,19 @@ FROM guardianship_data;</sql>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
     <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>is_guardian</field>
         <name>is_guardian</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
diff --git a/mappings/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow_delta.hpl b/mappings/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow_delta.hpl
index 0677aed..53b1676 100644
--- a/mappings/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow_delta.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow_delta.hpl
@@ -433,16 +433,19 @@ FROM guardianship_data;</sql>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
     <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>is_guardian</field>
         <name>is_guardian</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
diff --git a/mappings/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow_repeat.hpl
index 82a507f..e3b6359 100644
--- a/mappings/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_guardianship/parallel/citizen_guardianship_flow_repeat.hpl
@@ -394,7 +394,6 @@ DO UPDATE SET
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <limit/>
     <sql>WITH guardianship_data AS (
     SELECT
         ri.recruit_id AS recruit_id,
@@ -449,16 +448,19 @@ FROM guardianship_data;</sql>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
     <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>is_guardian</field>
         <name>is_guardian</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
diff --git a/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow.hpl b/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow.hpl
index 8d9cc59..c214d29 100644
--- a/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow.hpl
@@ -358,17 +358,20 @@ FROM wanted_data;</sql>
     </partitioning>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
-    <error_ignored>N</error_ignored>
+    <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>is_wanted</field>
         <name>is_wanted</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
@@ -378,7 +381,7 @@ FROM wanted_data;</sql>
       </value>
     </lookup>
     <skip_lookup>N</skip_lookup>
-    <use_batch>N</use_batch>
+    <use_batch>Y</use_batch>
     <attributes/>
     <GUI>
       <xloc>336</xloc>
diff --git a/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow_delta.hpl b/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow_delta.hpl
index 295d0ff..334833f 100644
--- a/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow_delta.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow_delta.hpl
@@ -364,17 +364,20 @@ FROM wanted_data;</sql>
     </partitioning>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
-    <error_ignored>N</error_ignored>
+    <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>is_wanted</field>
         <name>is_wanted</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
@@ -384,7 +387,7 @@ FROM wanted_data;</sql>
       </value>
     </lookup>
     <skip_lookup>N</skip_lookup>
-    <use_batch>N</use_batch>
+    <use_batch>Y</use_batch>
     <attributes/>
     <GUI>
       <xloc>400</xloc>
diff --git a/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow_repeat.hpl
index 3d49e52..1ceef00 100644
--- a/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/citizen_information_search/parallel/citizen_information_search_flow_repeat.hpl
@@ -336,7 +336,6 @@ DO UPDATE SET
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <limit/>
     <sql>WITH wanted_data AS (
     SELECT
         ri.recruit_id,
@@ -378,17 +377,20 @@ FROM wanted_data;</sql>
     </partitioning>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
-    <error_ignored>N</error_ignored>
+    <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>is_wanted</field>
         <name>is_wanted</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
@@ -398,7 +400,7 @@ FROM wanted_data;</sql>
       </value>
     </lookup>
     <skip_lookup>N</skip_lookup>
-    <use_batch>N</use_batch>
+    <use_batch>Y</use_batch>
     <attributes/>
     <GUI>
       <xloc>416</xloc>
diff --git a/mappings/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow.hpl b/mappings/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow.hpl
index 43d2f36..02eb149 100644
--- a/mappings/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow.hpl
@@ -294,7 +294,6 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <limit/>
     <sql>WITH ugolov_presl AS (
     SELECT
         jsonb_array_elements(ri.info->'svedFL'->'svedUgolovPresl'->'faktyUgolovPresl') AS up,
@@ -479,7 +478,7 @@ GROUP BY r.recruit_id, up.up, up.source_ctid;</sql>
     </partitioning>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
-    <error_ignored>N</error_ignored>
+    <error_ignored>Y</error_ignored>
     <lookup>
       <key>
         <condition>=</condition>
diff --git a/mappings/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow_delta.hpl b/mappings/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow_delta.hpl
index a912ec0..1fd14db 100644
--- a/mappings/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow_delta.hpl
+++ b/mappings/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow_delta.hpl
@@ -436,7 +436,6 @@ and recruitment_id = '${IDM_ID}';</sql>
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <limit/>
     <sql>WITH ugolov_presl AS (
     SELECT
         jsonb_array_elements(ri.info->'svedFL'->'svedUgolovPresl'->'faktyUgolovPresl') AS up,
@@ -504,17 +503,20 @@ GROUP BY r.recruit_id, up.up, up.source_ctid;</sql>
     </partitioning>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
-    <error_ignored>N</error_ignored>
+    <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>has_criminal_prosecution</field>
         <name>has_criminal_prosecution</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
diff --git a/mappings/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow_repeat.hpl
index 3b9f0a6..ee5e098 100644
--- a/mappings/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/prosecution/parallel/prosecution_flow_repeat.hpl
@@ -450,7 +450,6 @@ DO UPDATE SET
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <limit/>
     <sql>WITH ugolov_presl AS (
     SELECT
         jsonb_array_elements(ri.info->'svedFL'->'svedUgolovPresl'->'faktyUgolovPresl') AS up,
@@ -517,17 +516,20 @@ GROUP BY r.recruit_id, up.up, up.source_ctid;</sql>
     </partitioning>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
-    <error_ignored>N</error_ignored>
+    <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>has_criminal_prosecution</field>
         <name>has_criminal_prosecution</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
diff --git a/mappings/info_recruits/citizen_tables/punishment/parallel/punishment_flow.hpl b/mappings/info_recruits/citizen_tables/punishment/parallel/punishment_flow.hpl
index 4093e72..1f60b8c 100644
--- a/mappings/info_recruits/citizen_tables/punishment/parallel/punishment_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/punishment/parallel/punishment_flow.hpl
@@ -294,7 +294,6 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <limit/>
     <sql>WITH punishment_data AS (
     SELECT 
         ri.recruit_id,
@@ -471,22 +470,26 @@ GROUP BY recruit_id, punishment_info,source_ctid;</sql>
     </partitioning>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
-    <error_ignored>N</error_ignored>
+    <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>has_punishment_execution_info</field>
         <name>has_punishment_execution_info</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>has_sentence_info</field>
         <name>has_sentence_info</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
@@ -500,7 +503,7 @@ GROUP BY recruit_id, punishment_info,source_ctid;</sql>
       </value>
     </lookup>
     <skip_lookup>N</skip_lookup>
-    <use_batch>N</use_batch>
+    <use_batch>Y</use_batch>
     <attributes/>
     <GUI>
       <xloc>1008</xloc>
diff --git a/mappings/info_recruits/citizen_tables/punishment/parallel/punishment_flow_delta.hpl b/mappings/info_recruits/citizen_tables/punishment/parallel/punishment_flow_delta.hpl
index 7d68e9d..d53639f 100644
--- a/mappings/info_recruits/citizen_tables/punishment/parallel/punishment_flow_delta.hpl
+++ b/mappings/info_recruits/citizen_tables/punishment/parallel/punishment_flow_delta.hpl
@@ -512,22 +512,26 @@ GROUP BY recruit_id, punishment_info,source_ctid;</sql>
     </partitioning>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
-    <error_ignored>N</error_ignored>
+    <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>has_punishment_execution_info</field>
         <name>has_punishment_execution_info</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>has_sentence_info</field>
         <name>has_sentence_info</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
@@ -541,7 +545,7 @@ GROUP BY recruit_id, punishment_info,source_ctid;</sql>
       </value>
     </lookup>
     <skip_lookup>N</skip_lookup>
-    <use_batch>N</use_batch>
+    <use_batch>Y</use_batch>
     <attributes/>
     <GUI>
       <xloc>960</xloc>
diff --git a/mappings/info_recruits/citizen_tables/punishment/parallel/punishment_flow_repeat.hpl b/mappings/info_recruits/citizen_tables/punishment/parallel/punishment_flow_repeat.hpl
index 2cea196..8868c14 100644
--- a/mappings/info_recruits/citizen_tables/punishment/parallel/punishment_flow_repeat.hpl
+++ b/mappings/info_recruits/citizen_tables/punishment/parallel/punishment_flow_repeat.hpl
@@ -440,7 +440,6 @@ DO UPDATE SET
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <limit/>
     <sql>WITH punishment_data AS (
     SELECT 
         ri.recruit_id,
@@ -507,22 +506,26 @@ GROUP BY recruit_id, punishment_info,source_ctid;</sql>
     </partitioning>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
-    <error_ignored>N</error_ignored>
+    <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>has_punishment_execution_info</field>
         <name>has_punishment_execution_info</name>
+        <name2/>
       </key>
       <key>
         <condition>&lt;></condition>
         <field>has_sentence_info</field>
         <name>has_sentence_info</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
@@ -536,7 +539,7 @@ GROUP BY recruit_id, punishment_info,source_ctid;</sql>
       </value>
     </lookup>
     <skip_lookup>N</skip_lookup>
-    <use_batch>N</use_batch>
+    <use_batch>Y</use_batch>
     <attributes/>
     <GUI>
       <xloc>992</xloc>