diff --git a/v1_apache-hop dash mapping/predictive_metrics/data_collection.hpl b/v1_apache-hop dash mapping/predictive_metrics/data_collection.hpl
index ed25b40..6293d79 100644
--- a/v1_apache-hop dash mapping/predictive_metrics/data_collection.hpl	
+++ b/v1_apache-hop dash mapping/predictive_metrics/data_collection.hpl	
@@ -94,12 +94,12 @@ SELECT
     COALESCE(COUNT(r.id) FILTER (
     WHERE r.military_registration_date >= ys.year_date 
     AND r.military_registration_date < ys.year_date + INTERVAL '1 year'
-    AND r.registration_reasons @> '["3"]'::jsonb
+    AND r.registration_reasons @> '["5"]'::jsonb
   ), 0) AS reaching_17_age,
     COALESCE(COUNT(r.id) FILTER (
     WHERE r.military_registration_date >= ys.year_date 
     AND r.military_registration_date < ys.year_date + INTERVAL '1 year'
-    AND r.registration_reasons @> '["5"]'::jsonb
+    AND r.registration_reasons @> '["3"]'::jsonb
   ), 0) AS women_military_specialty,
   'Department' as schema
 FROM year_series ys
@@ -183,14 +183,11 @@ ORDER BY idm_id, updated_at DESC
     <only_when_have_rows>N</only_when_have_rows>
     <partitioning_daily>N</partitioning_daily>
     <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_field/>
     <partitioning_monthly>Y</partitioning_monthly>
-    <return_field/>
     <return_keys>N</return_keys>
     <schema>forecast</schema>
     <specify_fields>Y</specify_fields>
     <table>registered_citizens</table>
-    <tablename_field/>
     <tablename_in_field>N</tablename_in_field>
     <tablename_in_table>Y</tablename_in_table>
     <truncate>Y</truncate>