diff --git a/config/default/forms/app/death_report.xlsx b/config/default/forms/app/death_report.xlsx
index c9f08d4233b..b51bd18a1ad 100644
Binary files a/config/default/forms/app/death_report.xlsx and b/config/default/forms/app/death_report.xlsx differ
diff --git a/config/default/forms/app/death_report.xml b/config/default/forms/app/death_report.xml
index 1445c4d2b4b..a156627ad94 100644
--- a/config/default/forms/app/death_report.xml
+++ b/config/default/forms/app/death_report.xml
@@ -88,7 +88,7 @@ Date of Death: <output value=" /death_report/death_details/date_of_death "/>&lt;
         </translation>
       </itext>
       <instance>
-        <death_report id="death_report" prefix="J1!death_report!" delimiter="#" version="2022-08-19 15:07:41">
+        <death_report id="death_report" prefix="J1!death_report!" delimiter="#" version="2022-09-26 12:09:48">
           <inputs>
             <meta>
               <location>
@@ -182,8 +182,7 @@ Date of Death: <output value=" /death_report/death_details/date_of_death "/>&lt;
       <bind nodeset="/death_report/patient_name" type="string" calculate="../inputs/contact/name"/>
       <bind nodeset="/death_report/patient_short_name" type="string" calculate="../inputs/contact/short_name"/>
       <bind nodeset="/death_report/patient_display_name" type="string" calculate="if(../patient_short_name = '', ../patient_name, concat(../patient_name, ' (', ../patient_short_name, ')'))"/>
-      <bind nodeset="/death_report/death_details/date_of_death" type="date" jr:constraintMsg="jr:itext('/death_report/death_details/date_of_death:jr:constraintMsg')" required="true()" constraint="(decimal-date-time(.) &lt;= decimal-date-time(today()))
-and floor(decimal-date-time(today()) - decimal-date-time(.)) &lt;= 365"/>
+      <bind nodeset="/death_report/death_details/date_of_death" type="date" required="true()" constraint="(. &lt;= now()) and floor(decimal-date-time(today()) - decimal-date-time(.)) &lt;= 365" jr:constraintMsg="jr:itext('/death_report/death_details/date_of_death:jr:constraintMsg')"/>
       <bind nodeset="/death_report/death_details/place_of_death" type="select1" required="true()"/>
       <bind nodeset="/death_report/death_details/place_of_death_other" type="string" required="true()" relevant="selected(../place_of_death, 'other')"/>
       <bind nodeset="/death_report/death_details/death_information" type="string"/>
diff --git a/config/default/forms/app/delivery.xlsx b/config/default/forms/app/delivery.xlsx
index 100c4955bec..baa99fc46de 100644
Binary files a/config/default/forms/app/delivery.xlsx and b/config/default/forms/app/delivery.xlsx differ
diff --git a/config/default/forms/app/delivery.xml b/config/default/forms/app/delivery.xml
index 66670ee1b1d..a7bfb6a352f 100644
--- a/config/default/forms/app/delivery.xml
+++ b/config/default/forms/app/delivery.xml
@@ -795,7 +795,7 @@
         </translation>
       </itext>
       <instance>
-        <delivery id="delivery" prefix="J1!delivery!" delimiter="#" version="2022-08-23 13-48">
+        <delivery id="delivery" prefix="J1!delivery!" delimiter="#" version="2022-09-26 12-11">
           <inputs>
             <meta>
               <location>
@@ -1361,7 +1361,7 @@
       <bind nodeset="/delivery/patient_short_name" type="string" calculate="coalesce(../inputs/contact/short_name, ../summary/custom_translations/custom_woman_label)"/>
       <bind nodeset="/delivery/patient_short_name_start" type="string" calculate="coalesce(../inputs/contact/short_name, ../summary/custom_translations/custom_woman_start_label)"/>
       <bind nodeset="/delivery/t_danger_signs_referral_follow_up" type="string" calculate="../pnc_danger_sign_check/r_pnc_danger_sign_present"/>
-      <bind nodeset="/delivery/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(floor(decimal-date-time(today())) + 3)"/>
+      <bind nodeset="/delivery/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(decimal-date-time(today()) + 3)"/>
       <bind nodeset="/delivery/condition/woman_outcome" type="select1" required="true()"/>
       <bind nodeset="/delivery/pnc_danger_sign_check" relevant="selected(../condition/woman_outcome, 'alive_well') or
 selected(../condition/woman_outcome, 'alive_unwell')"/>
@@ -1377,7 +1377,7 @@ selected(../vaginal_bleeding, 'yes') or
 selected(../vaginal_discharge, 'yes') or
 selected(../convulsion, 'yes'), 'yes', 'no')"/>
       <bind nodeset="/delivery/death_info_woman" relevant="selected(../condition/woman_outcome, 'deceased')"/>
-      <bind nodeset="/delivery/death_info_woman/woman_death_date" type="date" constraint="decimal-date-time(.) &lt;= decimal-date-time(today()) and difference-in-months( ., today() ) &lt; 1" required="true()" jr:constraintMsg="jr:itext('/delivery/death_info_woman/woman_death_date:jr:constraintMsg')"/>
+      <bind nodeset="/delivery/death_info_woman/woman_death_date" type="date" jr:constraintMsg="jr:itext('/delivery/death_info_woman/woman_death_date:jr:constraintMsg')" required="true()" constraint=". &lt;= now() and difference-in-months( ., today() ) &lt; 1"/>
       <bind nodeset="/delivery/death_info_woman/woman_death_place" type="select1" required="true()"/>
       <bind nodeset="/delivery/death_info_woman/woman_death_birth" type="select1" required="true()"/>
       <bind nodeset="/delivery/death_info_woman/woman_death_add_notes" type="string" constraint="string-length(.) &lt;= 300" required="false()" jr:constraintMsg="jr:itext('/delivery/death_info_woman/woman_death_add_notes:jr:constraintMsg')"/>
@@ -1403,7 +1403,7 @@ selected(../convulsion, 'yes'), 'yes', 'no')"/>
       <bind nodeset="/delivery/delivery_outcome/babies_delivered_num" type="string" calculate="if(selected(../babies_delivered, '1'), 1, if(selected(../babies_delivered, '2'), 2, if(selected(../babies_delivered, '3'), 3, if(selected(../babies_delivered, 'other'), ../babies_delivered_other, 0))))"/>
       <bind nodeset="/delivery/delivery_outcome/babies_alive_num" type="string" calculate="if(selected(../babies_alive, '1'), 1, if(selected(../babies_alive, '2'), 2, if(selected(../babies_alive, '3'), 3, if(selected(../babies_alive, 'other'), ../babies_alive_other, 0))))"/>
       <bind nodeset="/delivery/delivery_outcome/babies_deceased_num" type="string" calculate="../babies_delivered_num - ../babies_alive_num"/>
-      <bind nodeset="/delivery/delivery_outcome/delivery_date" type="date" constraint="decimal-date-time(.) &lt;= decimal-date-time(today()) and difference-in-months( ., today() ) &lt; 1" required="true()" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/delivery_date:jr:constraintMsg')"/>
+      <bind nodeset="/delivery/delivery_outcome/delivery_date" type="date" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/delivery_date:jr:constraintMsg')" required="true()" constraint=". &lt;= now() and difference-in-months( ., today() ) &lt; 1"/>
       <bind nodeset="/delivery/delivery_outcome/delivery_place" type="select1" required="true()"/>
       <bind nodeset="/delivery/delivery_outcome/delivery_place_other" type="string" constraint="string-length(.) &lt;= 100" relevant="../delivery_place = 'other'" required="true()" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/delivery_place_other:jr:constraintMsg')"/>
       <bind nodeset="/delivery/delivery_outcome/delivery_mode" type="select1" relevant="../delivery_place = 'health_facility'" required="true()"/>
@@ -1411,7 +1411,7 @@ selected(../convulsion, 'yes'), 'yes', 'no')"/>
       <bind nodeset="/delivery/delivery_outcome/delivery_conductor_other" type="string" constraint="string-length(.) &lt;= 100" relevant="../delivery_conductor = 'other'" required="true()" jr:constraintMsg="jr:itext('/delivery/delivery_outcome/delivery_conductor_other:jr:constraintMsg')"/>
       <bind nodeset="/delivery/baby_death" relevant="../delivery_outcome/babies_deceased_num &gt; 0"/>
       <bind nodeset="/delivery/baby_death/baby_death_repeat_count" type="string" readonly="true()" calculate=" /delivery/delivery_outcome/babies_deceased_num "/>
-      <bind nodeset="/delivery/baby_death/baby_death_repeat/baby_death_date" type="date" constraint="decimal-date-time(.) &lt;= decimal-date-time(today()) and difference-in-months( ., today() ) &lt; 1" required="true()" jr:constraintMsg="jr:itext('/delivery/baby_death/baby_death_repeat/baby_death_date:jr:constraintMsg')"/>
+      <bind nodeset="/delivery/baby_death/baby_death_repeat/baby_death_date" type="date" jr:constraintMsg="jr:itext('/delivery/baby_death/baby_death_repeat/baby_death_date:jr:constraintMsg')" required="true()" constraint=". &lt;= now() and difference-in-months( ., today() ) &lt; 1"/>
       <bind nodeset="/delivery/baby_death/baby_death_repeat/baby_death_place" type="select1" required="true()"/>
       <bind nodeset="/delivery/baby_death/baby_death_repeat/stillbirth" type="select1" required="true()"/>
       <bind nodeset="/delivery/baby_death/baby_death_repeat/baby_death_add_notes" type="string" constraint="string-length(.) &lt;= 300" required="false()" jr:constraintMsg="jr:itext('/delivery/baby_death/baby_death_repeat/baby_death_add_notes:jr:constraintMsg')"/>
@@ -1464,7 +1464,7 @@ selected(../blue_skin, 'yes'), 'yes', 'no')"/>
       <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/baby_profile/date_of_birth" type="string" calculate="../../../../../delivery_outcome/delivery_date"/>
       <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/baby_profile/vaccines_received" type="string" calculate="../../vaccines_received"/>
       <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/baby_profile/t_danger_signs_referral_follow_up" type="string" calculate="../../r_baby_danger_sign_present"/>
-      <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/baby_profile/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(floor(decimal-date-time(today())) + 3)"/>
+      <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/baby_profile/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(decimal-date-time(today()) + 3)"/>
       <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/baby_profile/measurements/weight" type="string" calculate="../../../birth_weight"/>
       <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/baby_profile/measurements/length" type="string" calculate="../../../birth_length"/>
       <bind nodeset="/delivery/babys_condition/baby_repeat/baby_details/baby_profile/danger_signs/infected_umbilical_cord" type="string" calculate="../../../infected_umbilical_cord"/>
@@ -1496,7 +1496,7 @@ selected(../condition/woman_outcome, 'alive_unwell') or
       <bind nodeset="/delivery/pnc_visits/who_note" readonly="true()" type="string"/>
       <bind nodeset="/delivery/pnc_visits/pnc_visits_attended" type="select" constraint="not(selected(.,'none')) or count-selected(.) &lt; 2" required="true()"/>
       <bind nodeset="/delivery/pnc_visits/pnc_visits_additional" type="int" constraint=". &gt;=0 and . &lt;= 6" required="false()" jr:constraintMsg="jr:itext('/delivery/pnc_visits/pnc_visits_additional:jr:constraintMsg')"/>
-      <bind nodeset="/delivery/pnc_visits/days" type="string" calculate="floor(decimal-date-time(today())) - floor(decimal-date-time( /delivery/delivery_outcome/delivery_date ))"/>
+      <bind nodeset="/delivery/pnc_visits/days" type="string" calculate="floor(decimal-date-time(today()) - decimal-date-time( /delivery/delivery_outcome/delivery_date ))"/>
       <bind nodeset="/delivery/summary/r_submit_note" readonly="true()" type="string"/>
       <bind nodeset="/delivery/summary/r_summary_details" readonly="true()" type="string"/>
       <bind nodeset="/delivery/summary/r_patient_details" readonly="true()" type="string"/>
diff --git a/config/default/forms/app/pnc_danger_sign_follow_up_baby.xlsx b/config/default/forms/app/pnc_danger_sign_follow_up_baby.xlsx
index b75b54b5d9f..394b9f515b4 100644
Binary files a/config/default/forms/app/pnc_danger_sign_follow_up_baby.xlsx and b/config/default/forms/app/pnc_danger_sign_follow_up_baby.xlsx differ
diff --git a/config/default/forms/app/pnc_danger_sign_follow_up_baby.xml b/config/default/forms/app/pnc_danger_sign_follow_up_baby.xml
index 9e0eca73214..9bf4c528864 100644
--- a/config/default/forms/app/pnc_danger_sign_follow_up_baby.xml
+++ b/config/default/forms/app/pnc_danger_sign_follow_up_baby.xml
@@ -158,7 +158,7 @@
         </translation>
       </itext>
       <instance>
-        <pnc_danger_sign_follow_up_baby id="pnc_danger_sign_follow_up_baby" prefix="J1!pnc_danger_sign_follow_up_baby!" delimiter="#" version="2022-08-19 15:16:18">
+        <pnc_danger_sign_follow_up_baby id="pnc_danger_sign_follow_up_baby" prefix="J1!pnc_danger_sign_follow_up_baby!" delimiter="#" version="2022-09-26 09:13:25">
           <inputs>
             <meta>
               <location>
@@ -258,7 +258,7 @@
       <bind nodeset="/pnc_danger_sign_follow_up_baby/patient_uuid" type="string" calculate="../inputs/contact/_id"/>
       <bind nodeset="/pnc_danger_sign_follow_up_baby/patient_id" type="string" calculate="../inputs/contact/patient_id"/>
       <bind nodeset="/pnc_danger_sign_follow_up_baby/patient_name" type="string" calculate="../inputs/contact/name"/>
-      <bind nodeset="/pnc_danger_sign_follow_up_baby/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(floor(decimal-date-time(today())) + 3)"/>
+      <bind nodeset="/pnc_danger_sign_follow_up_baby/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(decimal-date-time(today()) + 3)"/>
       <bind nodeset="/pnc_danger_sign_follow_up_baby/t_danger_signs_referral_follow_up" type="string" calculate="../danger_signs/r_danger_sign_present"/>
       <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/visit_confirm" type="select1" required="true()"/>
       <bind nodeset="/pnc_danger_sign_follow_up_baby/danger_signs/danger_sign_present" type="select1" required="true()"/>
diff --git a/config/default/forms/app/pnc_danger_sign_follow_up_mother.xlsx b/config/default/forms/app/pnc_danger_sign_follow_up_mother.xlsx
index 7145c3163a7..366c5ec315b 100644
Binary files a/config/default/forms/app/pnc_danger_sign_follow_up_mother.xlsx and b/config/default/forms/app/pnc_danger_sign_follow_up_mother.xlsx differ
diff --git a/config/default/forms/app/pnc_danger_sign_follow_up_mother.xml b/config/default/forms/app/pnc_danger_sign_follow_up_mother.xml
index 0bddb37a649..0b2c732d8fd 100644
--- a/config/default/forms/app/pnc_danger_sign_follow_up_mother.xml
+++ b/config/default/forms/app/pnc_danger_sign_follow_up_mother.xml
@@ -128,7 +128,7 @@
         </translation>
       </itext>
       <instance>
-        <pnc_danger_sign_follow_up_mother id="pnc_danger_sign_follow_up_mother" prefix="J1!pnc_danger_sign_follow_up_mother!" delimiter="#" version="2019-11-04 14:08:55">
+        <pnc_danger_sign_follow_up_mother id="pnc_danger_sign_follow_up_mother" prefix="J1!pnc_danger_sign_follow_up_mother!" delimiter="#" version="2022-09-26 09:14:27">
           <inputs>
             <meta>
               <location>
@@ -230,7 +230,7 @@
       <bind nodeset="/pnc_danger_sign_follow_up_mother/patient_name" type="string" calculate="../inputs/contact/name"/>
       <bind nodeset="/pnc_danger_sign_follow_up_mother/patient_short_name" type="string" calculate="coalesce(../inputs/contact/short_name, ../danger_signs/custom_translations/custom_woman_label)"/>
       <bind nodeset="/pnc_danger_sign_follow_up_mother/patient_short_name_start" type="string" calculate="coalesce(../inputs/contact/short_name, ../danger_signs/custom_translations/custom_woman_start_label)"/>
-      <bind nodeset="/pnc_danger_sign_follow_up_mother/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(floor(decimal-date-time(today())) + 3)"/>
+      <bind nodeset="/pnc_danger_sign_follow_up_mother/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(decimal-date-time(today()) + 3)"/>
       <bind nodeset="/pnc_danger_sign_follow_up_mother/t_danger_signs_referral_follow_up" type="string" calculate="../danger_signs/r_danger_sign_present"/>
       <bind nodeset="/pnc_danger_sign_follow_up_mother/danger_signs/visit_confirm" type="select1" required="true()"/>
       <bind nodeset="/pnc_danger_sign_follow_up_mother/danger_signs/danger_sign_present" type="select1" required="true()"/>
diff --git a/config/default/forms/app/pregnancy.xlsx b/config/default/forms/app/pregnancy.xlsx
index 7d887b16fef..40f15a29e25 100644
Binary files a/config/default/forms/app/pregnancy.xlsx and b/config/default/forms/app/pregnancy.xlsx differ
diff --git a/config/default/forms/app/pregnancy.xml b/config/default/forms/app/pregnancy.xml
index 331b1c8dee0..ceb9a8de5ab 100644
--- a/config/default/forms/app/pregnancy.xml
+++ b/config/default/forms/app/pregnancy.xml
@@ -668,7 +668,7 @@
         </translation>
       </itext>
       <instance>
-        <pregnancy id="pregnancy" prefix="J1!pregnancy!" delimiter="#" version="2022-08-19 16:05:54">
+        <pregnancy id="pregnancy" prefix="J1!pregnancy!" delimiter="#" version="2022-09-26 11:42:48">
           <inputs>
             <meta>
               <location>
@@ -995,20 +995,20 @@
       <bind nodeset="/pregnancy/tt_received" type="string" calculate="../safe_pregnancy_practices/tetanus/tt_imm_received"/>
       <bind nodeset="/pregnancy/t_pregnancy_follow_up_date" type="string" calculate="../anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date"/>
       <bind nodeset="/pregnancy/t_pregnancy_follow_up" type="string" calculate="../anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known"/>
-      <bind nodeset="/pregnancy/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(floor(decimal-date-time(today())) + 3)"/>
+      <bind nodeset="/pregnancy/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(decimal-date-time(today()) + 3)"/>
       <bind nodeset="/pregnancy/t_danger_signs_referral_follow_up" type="string" calculate="../danger_signs/r_danger_sign_present"/>
       <bind nodeset="/pregnancy/gestational_age/register_method/register_note" readonly="true()" type="string"/>
       <bind nodeset="/pregnancy/gestational_age/register_method/lmp_method" type="select1" required="true()"/>
       <bind nodeset="/pregnancy/gestational_age/method_lmp" relevant="selected(../register_method/lmp_method, 'method_lmp')"/>
-      <bind nodeset="/pregnancy/gestational_age/method_lmp/u_lmp_date" type="date" required="true()" jr:constraintMsg="jr:itext('/pregnancy/gestational_age/method_lmp/u_lmp_date:jr:constraintMsg')" constraint=". &lt;= date-time(floor(decimal-date-time(today())) - (1 * 30)) and
-. &gt;= date-time(floor(decimal-date-time(today())) - (9 * 30))"/>
+      <bind nodeset="/pregnancy/gestational_age/method_lmp/u_lmp_date" type="date" required="true()" constraint=". &lt;= date-time(decimal-date-time(today()) - (1 * 30)) and
+. &gt;= date-time(decimal-date-time(today()) - (9 * 30))" jr:constraintMsg="jr:itext('/pregnancy/gestational_age/method_lmp/u_lmp_date:jr:constraintMsg')"/>
       <bind nodeset="/pregnancy/gestational_age/method_approx" relevant="selected(../register_method/lmp_method, 'method_approx')"/>
       <bind nodeset="/pregnancy/gestational_age/method_approx/lmp_approx" type="select1" required="true()"/>
       <bind nodeset="/pregnancy/gestational_age/method_approx/lmp_approx_weeks" type="int" required="true()" relevant="selected(../lmp_approx, 'approx_weeks')" jr:constraintMsg="jr:itext('/pregnancy/gestational_age/method_approx/lmp_approx_weeks:jr:constraintMsg')" constraint=". &gt;= 4 and . &lt;= 40"/>
       <bind nodeset="/pregnancy/gestational_age/method_approx/lmp_approx_months" type="int" required="true()" relevant="selected(../lmp_approx, 'approx_months')" jr:constraintMsg="jr:itext('/pregnancy/gestational_age/method_approx/lmp_approx_months:jr:constraintMsg')" constraint=". &gt;= 1 and . &lt;= 9"/>
       <bind nodeset="/pregnancy/gestational_age/method_edd" relevant="selected(../register_method/lmp_method, 'method_edd')"/>
-      <bind nodeset="/pregnancy/gestational_age/method_edd/u_edd" type="date" required="true()" jr:constraintMsg="jr:itext('/pregnancy/gestational_age/method_edd/u_edd:jr:constraintMsg')" constraint=". &gt;= date-time(floor(decimal-date-time(today()))) and
-. &lt;= date-time(floor(decimal-date-time(today())) + (9 * 30))"/>
+      <bind nodeset="/pregnancy/gestational_age/method_edd/u_edd" type="date" required="true()" constraint=". &gt;= today() and
+. &lt;= date-time(decimal-date-time(today()) + (9 * 30))" jr:constraintMsg="jr:itext('/pregnancy/gestational_age/method_edd/u_edd:jr:constraintMsg')"/>
       <bind nodeset="/pregnancy/gestational_age/method_lmp_summary" relevant="not(selected(../register_method/lmp_method, 'method_none'))"/>
       <bind nodeset="/pregnancy/gestational_age/method_lmp_summary/lmp_check_note" readonly="true()" type="string" relevant="selected(../../register_method/lmp_method, 'method_lmp')"/>
       <bind nodeset="/pregnancy/gestational_age/method_lmp_summary/lmp_approx_weeks_check_note" readonly="true()" type="string" relevant="selected(../../method_approx/lmp_approx, 'approx_weeks')"/>
@@ -1021,8 +1021,8 @@ or selected(../../method_approx/lmp_approx, 'approx_months')"/>
       <bind nodeset="/pregnancy/gestational_age/method_lmp_summary/edd_check_note" readonly="true()" type="string"/>
       <bind nodeset="/pregnancy/gestational_age/g_lmp_date_8601" type="string" calculate="format-date-time(
 if(selected(../register_method/lmp_method, 'method_lmp'), ../method_lmp/u_lmp_date,
-if(selected(../method_approx/lmp_approx, 'approx_weeks'), date-time(floor(decimal-date-time(today())) - (../method_approx/lmp_approx_weeks * 7)), 
-if(selected(../method_approx/lmp_approx, 'approx_months'), date-time(floor(decimal-date-time(today())) - round(../method_approx/lmp_approx_months * 30.5)),
+if(selected(../method_approx/lmp_approx, 'approx_weeks'), date-time(decimal-date-time(today()) - (../method_approx/lmp_approx_weeks * 7)), 
+if(selected(../method_approx/lmp_approx, 'approx_months'), date-time(decimal-date-time(today()) - round(../method_approx/lmp_approx_months * 30.5)),
 if(selected(../register_method/lmp_method, 'method_edd'), date-time(decimal-date-time(../method_edd/u_edd) - 280), '')
 ))), &quot;%Y-%m-%d&quot;)"/>
       <bind nodeset="/pregnancy/gestational_age/g_lmp_date" type="string" calculate="format-date-time(../g_lmp_date_8601, &quot;%e %b, %Y&quot;)"/>
@@ -1037,16 +1037,16 @@ if(selected(../register_method/lmp_method, 'method_edd'), date-time(decimal-date
       <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_count_confim_note_single" readonly="true()" type="string" relevant=" /pregnancy/anc_visits_hf/anc_visits_hf_past/visited_hf_count  = 1"/>
       <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_count_confim_note_multiple" readonly="true()" type="string" relevant=" /pregnancy/anc_visits_hf/anc_visits_hf_past/visited_hf_count  &gt; 1"/>
       <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_date_ask_single" type="select1" required="true()" relevant=" /pregnancy/anc_visits_hf/anc_visits_hf_past/visited_hf_count  = 1"/>
-      <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_date_single" type="date" required="true()" relevant="selected(../visited_date_ask_single, 'yes')" jr:constraintMsg="jr:itext('/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_date_single:jr:constraintMsg')" constraint="decimal-date-time(.) &lt;= floor(decimal-date-time(today())) and decimal-date-time(.) &gt;= (decimal-date-time( /pregnancy/gestational_age/g_lmp_date_8601 ))"/>
+      <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_date_single" type="date" required="true()" relevant="selected(../visited_date_ask_single, 'yes')" constraint=". &lt;= today() and . &gt;=  /pregnancy/gestational_age/g_lmp_date_8601 " jr:constraintMsg="jr:itext('/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_date_single:jr:constraintMsg')"/>
       <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_dates_multiple_note" readonly="true()" type="string" relevant=" /pregnancy/anc_visits_hf/anc_visits_hf_past/visited_hf_count  &gt; 1"/>
       <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_dates_multiple_note_section" readonly="true()" type="string" relevant=" /pregnancy/anc_visits_hf/anc_visits_hf_past/visited_hf_count  &gt; 1"/>
       <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_dates_count" type="string" readonly="true()" calculate=" /pregnancy/anc_visits_hf/anc_visits_hf_past/visited_hf_count "/>
       <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_dates" relevant=" /pregnancy/anc_visits_hf/anc_visits_hf_past/visited_hf_count  &gt; 1"/>
       <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_dates/visited_date_ask_multiple" type="select1" required="true()" relevant=" /pregnancy/anc_visits_hf/anc_visits_hf_past/visited_hf_count  &gt; 1"/>
-      <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_dates/visited_date" type="date" required="true()" relevant="selected(../visited_date_ask_multiple, 'yes')" jr:constraintMsg="jr:itext('/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_dates/visited_date:jr:constraintMsg')" constraint="decimal-date-time(.) &lt;= floor(decimal-date-time(today())) and decimal-date-time(.) &gt;= (decimal-date-time( /pregnancy/gestational_age/g_lmp_date_8601 ))"/>
+      <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_dates/visited_date" type="date" required="true()" relevant="selected(../visited_date_ask_multiple, 'yes')" constraint=". &lt;= today() and . &gt;=  /pregnancy/gestational_age/g_lmp_date_8601 " jr:constraintMsg="jr:itext('/pregnancy/anc_visits_hf/anc_visits_hf_past/visited_dates_group/visited_dates/visited_date:jr:constraintMsg')"/>
       <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known" type="select1" required="true()"/>
-      <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date" type="date" required="true()" relevant="selected(../appointment_date_known, 'yes')" jr:constraintMsg="jr:itext('/pregnancy/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date:jr:constraintMsg')" constraint="(decimal-date-time(.) &gt;= floor(decimal-date-time(today()))) and
-(decimal-date-time(.) &lt;= floor(decimal-date-time(today() + 30)))"/>
+      <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date" type="date" required="true()" relevant="selected(../appointment_date_known, 'yes')" constraint="(. &gt;= today()) and
+(decimal-date-time(.) &lt;= decimal-date-time(today()) + 30)" jr:constraintMsg="jr:itext('/pregnancy/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date:jr:constraintMsg')"/>
       <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note" relevant="selected(../anc_next_visit_date/appointment_date_known, 'no')"/>
       <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/who_recommends_note" readonly="true()" type="string"/>
       <bind nodeset="/pregnancy/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/prenancy_age_note" readonly="true()" type="string"/>
@@ -1176,14 +1176,14 @@ selected(../iron_folate/iron_folate_daily, 'no')), 'yes', 'no')"/>
 ../next_visit_weeks &lt; 40 and
 ../next_visit_weeks &gt; 0"/>
       <bind nodeset="/pregnancy/summary/r_fup_pregnancy_visit_2_weeks" readonly="true()" type="string" relevant="selected(../../gestational_age/register_method/lmp_method, 'method_none')"/>
-      <bind nodeset="/pregnancy/summary/next_visit_weeks" type="string" calculate="round((if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 12*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy/lmp_date_8601 ) + 12*7,
-if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 20*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy/lmp_date_8601 ) + 20*7,
-if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 26*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy/lmp_date_8601 ) + 26*7,
-if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 30*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy/lmp_date_8601 ) + 30*7,
-if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 34*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy/lmp_date_8601 ) + 34*7,
-if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 36*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy/lmp_date_8601 ) + 36*7,
-if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 38*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy/lmp_date_8601 ) + 38*7,
-if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 40*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy/lmp_date_8601 ) + 40*7, 0
+      <bind nodeset="/pregnancy/summary/next_visit_weeks" type="string" calculate="round((if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 12*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy/lmp_date_8601 ) + 12*7,
+if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 20*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy/lmp_date_8601 ) + 20*7,
+if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 26*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy/lmp_date_8601 ) + 26*7,
+if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 30*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy/lmp_date_8601 ) + 30*7,
+if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 34*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy/lmp_date_8601 ) + 34*7,
+if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 36*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy/lmp_date_8601 ) + 36*7,
+if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 38*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy/lmp_date_8601 ) + 38*7,
+if((decimal-date-time( /pregnancy/lmp_date_8601 ) + 40*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy/lmp_date_8601 ) + 40*7, 0
 )))))))) - decimal-date-time(today())) div 7, 0)"/>
       <bind nodeset="/pregnancy/summary/edd_summary" type="string" calculate="format-date-time( /pregnancy/edd_8601 , &quot;%e %b, %Y&quot;)"/>
       <bind nodeset="/pregnancy/summary/next_appointment_date" type="string" calculate="format-date-time( /pregnancy/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date , &quot;%e %b, %Y&quot;)"/>
diff --git a/config/default/forms/app/pregnancy_danger_sign.xlsx b/config/default/forms/app/pregnancy_danger_sign.xlsx
index 48693683d07..d710ddd3c5f 100644
Binary files a/config/default/forms/app/pregnancy_danger_sign.xlsx and b/config/default/forms/app/pregnancy_danger_sign.xlsx differ
diff --git a/config/default/forms/app/pregnancy_danger_sign.xml b/config/default/forms/app/pregnancy_danger_sign.xml
index 2695d4ce66c..77e55b1d6d2 100644
--- a/config/default/forms/app/pregnancy_danger_sign.xml
+++ b/config/default/forms/app/pregnancy_danger_sign.xml
@@ -167,7 +167,7 @@
         </translation>
       </itext>
       <instance>
-        <pregnancy_danger_sign id="pregnancy_danger_sign" prefix="J1!pregnancy_danger_sign!" delimiter="#" version="2019-11-04 13:13:48">
+        <pregnancy_danger_sign id="pregnancy_danger_sign" prefix="J1!pregnancy_danger_sign!" delimiter="#" version="2022-09-26 11:20:33">
           <inputs>
             <meta>
               <location>
@@ -277,7 +277,7 @@
       <bind nodeset="/pregnancy_danger_sign/patient_name" type="string" calculate="../inputs/contact/name"/>
       <bind nodeset="/pregnancy_danger_sign/patient_short_name" type="string" calculate="coalesce(../inputs/contact/short_name, ../danger_signs/custom_translations/custom_woman_label)"/>
       <bind nodeset="/pregnancy_danger_sign/patient_short_name_start" type="string" calculate="coalesce(../inputs/contact/short_name, ../danger_signs/custom_translations/custom_woman_start_label)"/>
-      <bind nodeset="/pregnancy_danger_sign/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(floor(decimal-date-time(today())) + 3)"/>
+      <bind nodeset="/pregnancy_danger_sign/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(decimal-date-time(today()) + 3)"/>
       <bind nodeset="/pregnancy_danger_sign/t_danger_signs_referral_follow_up" type="string" calculate="../danger_signs/r_danger_sign_present"/>
       <bind nodeset="/pregnancy_danger_sign/pregnancy_uuid_ctx" type="string" calculate="if(instance('contact-summary')/context/pregnancy_uuid != '', instance('contact-summary')/context/pregnancy_uuid, .)"/>
       <bind nodeset="/pregnancy_danger_sign/danger_signs/danger_signs_note" readonly="true()" type="string"/>
diff --git a/config/default/forms/app/pregnancy_danger_sign_follow_up.xlsx b/config/default/forms/app/pregnancy_danger_sign_follow_up.xlsx
index 4457023dc62..08325c685ce 100644
Binary files a/config/default/forms/app/pregnancy_danger_sign_follow_up.xlsx and b/config/default/forms/app/pregnancy_danger_sign_follow_up.xlsx differ
diff --git a/config/default/forms/app/pregnancy_danger_sign_follow_up.xml b/config/default/forms/app/pregnancy_danger_sign_follow_up.xml
index 5aa7554c6ec..78d36a5ed0d 100644
--- a/config/default/forms/app/pregnancy_danger_sign_follow_up.xml
+++ b/config/default/forms/app/pregnancy_danger_sign_follow_up.xml
@@ -179,7 +179,7 @@
         </translation>
       </itext>
       <instance>
-        <pregnancy_danger_sign_follow_up id="pregnancy_danger_sign_follow_up" prefix="J1!pregnancy_danger_sign_follow_up!" delimiter="#" version="2022-08-19 15:27:41">
+        <pregnancy_danger_sign_follow_up id="pregnancy_danger_sign_follow_up" prefix="J1!pregnancy_danger_sign_follow_up!" delimiter="#" version="2022-09-26 11:22:25">
           <inputs>
             <meta>
               <location>
@@ -292,7 +292,7 @@
       <bind nodeset="/pregnancy_danger_sign_follow_up/patient_name" type="string" calculate="../inputs/contact/name"/>
       <bind nodeset="/pregnancy_danger_sign_follow_up/patient_short_name" type="string" calculate="coalesce(../inputs/contact/short_name, ../danger_signs/custom_translations/custom_woman_label)"/>
       <bind nodeset="/pregnancy_danger_sign_follow_up/patient_short_name_start" type="string" calculate="coalesce(../inputs/contact/short_name, ../danger_signs/custom_translations/custom_woman_start_label)"/>
-      <bind nodeset="/pregnancy_danger_sign_follow_up/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(floor(decimal-date-time(today())) + 3)"/>
+      <bind nodeset="/pregnancy_danger_sign_follow_up/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(decimal-date-time(today()) + 3)"/>
       <bind nodeset="/pregnancy_danger_sign_follow_up/t_danger_signs_referral_follow_up" type="string" calculate="../danger_signs/r_danger_sign_present"/>
       <bind nodeset="/pregnancy_danger_sign_follow_up/pregnancy_uuid_ctx" type="string" calculate="if(instance('contact-summary')/context/pregnancy_uuid != '', instance('contact-summary')/context/pregnancy_uuid, .)"/>
       <bind nodeset="/pregnancy_danger_sign_follow_up/danger_signs/visit_confirm" type="select1" required="true()"/>
diff --git a/config/default/forms/app/pregnancy_home_visit.xlsx b/config/default/forms/app/pregnancy_home_visit.xlsx
index 668d3133f5d..211d898edb8 100644
Binary files a/config/default/forms/app/pregnancy_home_visit.xlsx and b/config/default/forms/app/pregnancy_home_visit.xlsx differ
diff --git a/config/default/forms/app/pregnancy_home_visit.xml b/config/default/forms/app/pregnancy_home_visit.xml
index 5c5db5c2b8a..eb7bcac4f04 100644
--- a/config/default/forms/app/pregnancy_home_visit.xml
+++ b/config/default/forms/app/pregnancy_home_visit.xml
@@ -755,7 +755,7 @@
         </translation>
       </itext>
       <instance>
-        <pregnancy_home_visit id="pregnancy_home_visit" prefix="J1!pregnancy_home_visit!" delimiter="#" version="2022-08-19 15:52:36">
+        <pregnancy_home_visit id="pregnancy_home_visit" prefix="J1!pregnancy_home_visit!" delimiter="#" version="2022-09-26 11:35:11">
           <inputs>
             <meta>
               <location>
@@ -1241,14 +1241,14 @@
       <bind nodeset="/pregnancy_home_visit/patient_short_name_start" type="string" calculate="coalesce(../inputs/contact/short_name, ../summary/custom_translations/custom_woman_start_label)"/>
       <bind nodeset="/pregnancy_home_visit/lmp_date_8601" type="string" calculate="if(selected(../pregnancy_summary/g_age_correct, 'no'), ../update_g_age/lmp_date_8601_new, ../context_vars/lmp_date_8601_ctx)"/>
       <bind nodeset="/pregnancy_home_visit/edd_8601" type="string" calculate="if(selected(../pregnancy_summary/g_age_correct, 'no'), ../update_g_age/edd_8601_new, format-date-time(date-time(decimal-date-time(../context_vars/lmp_date_8601_ctx + 280)), &quot;%Y-%m-%d&quot;))"/>
-      <bind nodeset="/pregnancy_home_visit/days_since_lmp" type="string" calculate="floor(decimal-date-time(today())) - decimal-date-time(../lmp_date_8601)" relevant="../lmp_date_8601 != ''"/>
+      <bind nodeset="/pregnancy_home_visit/days_since_lmp" type="string" calculate="floor(decimal-date-time(today()) - decimal-date-time(../lmp_date_8601))" relevant="../lmp_date_8601 != ''"/>
       <bind nodeset="/pregnancy_home_visit/weeks_since_lmp" type="string" calculate="round(../days_since_lmp div 7, 2)" relevant="../lmp_date_8601 != ''"/>
       <bind nodeset="/pregnancy_home_visit/weeks_since_lmp_rounded" type="string" calculate="floor(../days_since_lmp div 7)" relevant="../lmp_date_8601 != ''"/>
       <bind nodeset="/pregnancy_home_visit/lmp_method_approx" type="string" calculate="if(selected(../update_g_age/update_method/g_age_update_method, 'method_weeks'), 'yes', 'no')"/>
       <bind nodeset="/pregnancy_home_visit/lmp_updated" type="string" calculate="if(selected(../pregnancy_summary/g_age_correct, 'no') and (decimal-date-time(../lmp_date_8601) - decimal-date-time(../context_vars/lmp_date_8601_ctx) != 0), 'yes', 'no')"/>
       <bind nodeset="/pregnancy_home_visit/t_pregnancy_follow_up_date" type="string" calculate="../anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date"/>
       <bind nodeset="/pregnancy_home_visit/t_pregnancy_follow_up" type="string" calculate="../anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known"/>
-      <bind nodeset="/pregnancy_home_visit/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(floor(decimal-date-time(today())) + 3)"/>
+      <bind nodeset="/pregnancy_home_visit/t_danger_signs_referral_follow_up_date" type="string" calculate="date-time(decimal-date-time(today()) + 3)"/>
       <bind nodeset="/pregnancy_home_visit/t_danger_signs_referral_follow_up" type="string" calculate="../danger_signs/r_danger_sign_present"/>
       <bind nodeset="/pregnancy_home_visit/hiv_status_known" type="string" calculate="if(../context_vars/hiv_tested_ctx = 'yes', 'yes', ../safe_pregnancy_practices/hiv_status/hiv_tested)"/>
       <bind nodeset="/pregnancy_home_visit/tt_received" type="string" calculate="if(../context_vars/tt_received_ctx = 'yes', 'yes', ../safe_pregnancy_practices/tetanus/tt_imm_received)"/>
@@ -1263,7 +1263,7 @@
       <bind nodeset="/pregnancy_home_visit/context_vars/deworming_med_received_ctx" type="string" calculate="if(instance('contact-summary')/context/deworming_med_received_past != '', instance('contact-summary')/context/deworming_med_received_past , .)"/>
       <bind nodeset="/pregnancy_home_visit/context_vars/edd_ctx" type="string" calculate="if(../lmp_date_8601_ctx = '', 'unknown', format-date-time(date-time(decimal-date-time(../lmp_date_8601_ctx) + 280), &quot;%e %b, %Y&quot;))"/>
       <bind nodeset="/pregnancy_home_visit/context_vars/weeks_since_lmp_rounded_ctx" type="string" calculate="if(../lmp_date_8601_ctx = '', 'unknown',
-floor((floor(decimal-date-time(today())) - decimal-date-time(../lmp_date_8601_ctx)) div 7))"/>
+floor((decimal-date-time(today()) - decimal-date-time(../lmp_date_8601_ctx)) div 7))"/>
       <bind nodeset="/pregnancy_home_visit/context_vars/pregnancy_uuid_ctx" type="string" calculate="if(instance('contact-summary')/context/pregnancy_uuid != '', instance('contact-summary')/context/pregnancy_uuid, .)"/>
       <bind nodeset="/pregnancy_home_visit/pregnancy_summary/current_weeks_pregnant" readonly="true()" type="string" relevant=" /pregnancy_home_visit/context_vars/weeks_since_lmp_rounded_ctx  != 'unknown'"/>
       <bind nodeset="/pregnancy_home_visit/pregnancy_summary/current_weeks_pregnant_unknown" readonly="true()" type="string" relevant=" /pregnancy_home_visit/context_vars/weeks_since_lmp_rounded_ctx  = 'unknown'"/>
@@ -1273,9 +1273,9 @@ floor((floor(decimal-date-time(today())) - decimal-date-time(../lmp_date_8601_ct
       <bind nodeset="/pregnancy_home_visit/pregnancy_summary/g_age_correct" type="select1" required="true()" relevant="selected(../visit_option, 'yes')"/>
       <bind nodeset="/pregnancy_home_visit/pregnancy_ended" relevant="not(selected(../pregnancy_summary/visit_option, 'yes'))"/>
       <bind nodeset="/pregnancy_home_visit/pregnancy_ended/miscarriage_note" readonly="true()" type="string" relevant="selected(../../pregnancy_summary/visit_option, 'miscarriage')"/>
-      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/miscarriage_date" type="date" required="true()" constraint="decimal-date-time(.) &lt;= floor(decimal-date-time(today())) and ( /pregnancy_home_visit/lmp_date_8601  = '' or decimal-date-time(.) &gt;= (decimal-date-time( /pregnancy_home_visit/lmp_date_8601 )))" jr:constraintMsg="jr:itext('/pregnancy_home_visit/pregnancy_ended/miscarriage_date:jr:constraintMsg')" relevant="selected(../../pregnancy_summary/visit_option, 'miscarriage')"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/miscarriage_date" type="date" relevant="selected(../../pregnancy_summary/visit_option, 'miscarriage')" constraint=". &lt;= today() and ( /pregnancy_home_visit/lmp_date_8601  = '' or . &gt;=  /pregnancy_home_visit/lmp_date_8601 )" required="true()" jr:constraintMsg="jr:itext('/pregnancy_home_visit/pregnancy_ended/miscarriage_date:jr:constraintMsg')"/>
       <bind nodeset="/pregnancy_home_visit/pregnancy_ended/abortion_note" readonly="true()" type="string" relevant="selected(../../pregnancy_summary/visit_option, 'abortion')"/>
-      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/abortion_date" type="date" required="true()" constraint="decimal-date-time(.) &lt;= floor(decimal-date-time(today())) and ( /pregnancy_home_visit/lmp_date_8601  = '' or decimal-date-time(.) &gt;= (decimal-date-time( /pregnancy_home_visit/lmp_date_8601 )))" jr:constraintMsg="jr:itext('/pregnancy_home_visit/pregnancy_ended/abortion_date:jr:constraintMsg')" relevant="selected(../../pregnancy_summary/visit_option, 'abortion')"/>
+      <bind nodeset="/pregnancy_home_visit/pregnancy_ended/abortion_date" type="date" relevant="selected(../../pregnancy_summary/visit_option, 'abortion')" constraint=". &lt;= today() and ( /pregnancy_home_visit/lmp_date_8601  = '' or . &gt;=  /pregnancy_home_visit/lmp_date_8601 )" required="true()" jr:constraintMsg="jr:itext('/pregnancy_home_visit/pregnancy_ended/abortion_date:jr:constraintMsg')"/>
       <bind nodeset="/pregnancy_home_visit/pregnancy_ended/refusing_note" readonly="true()" type="string" relevant="selected(../../pregnancy_summary/visit_option, 'refused')"/>
       <bind nodeset="/pregnancy_home_visit/pregnancy_ended/migrated_note" readonly="true()" type="string" relevant="selected(../../pregnancy_summary/visit_option, 'migrated')"/>
       <bind nodeset="/pregnancy_home_visit/pregnancy_ended/end_pregnancy_note" readonly="true()" type="string" relevant="selected(../../pregnancy_summary/visit_option, 'miscarriage') or
@@ -1290,8 +1290,8 @@ selected(../../pregnancy_summary/visit_option, 'migrated')"/>
 selected(../pregnancy_summary/g_age_correct, 'no')"/>
       <bind nodeset="/pregnancy_home_visit/update_g_age/update_method/g_age_update_method" type="select1" required="true()"/>
       <bind nodeset="/pregnancy_home_visit/update_g_age/update_method/lmp_weeks_new" type="int" required="true()" constraint=". &gt;= 4 and . &lt;= 40" relevant="selected(../g_age_update_method, 'method_weeks')" jr:constraintMsg="jr:itext('/pregnancy_home_visit/update_g_age/update_method/lmp_weeks_new:jr:constraintMsg')"/>
-      <bind nodeset="/pregnancy_home_visit/update_g_age/update_method/u_edd_new" type="date" required="true()" constraint=". &gt;= date-time(floor(decimal-date-time(today()))) and
-. &lt;= date-time(floor(decimal-date-time(today())) + (9 * 30))" relevant="selected(../g_age_update_method, 'method_edd')" jr:constraintMsg="jr:itext('/pregnancy_home_visit/update_g_age/update_method/u_edd_new:jr:constraintMsg')"/>
+      <bind nodeset="/pregnancy_home_visit/update_g_age/update_method/u_edd_new" type="date" relevant="selected(../g_age_update_method, 'method_edd')" constraint=". &gt;= today() and
+. &lt;= date-time(decimal-date-time(today()) + (9 * 30))" required="true()" jr:constraintMsg="jr:itext('/pregnancy_home_visit/update_g_age/update_method/u_edd_new:jr:constraintMsg')"/>
       <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/update_check_note" readonly="true()" type="string"/>
       <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/previous_info" readonly="true()" type="string"/>
       <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/previous_g_age" readonly="true()" type="string" relevant=" /pregnancy_home_visit/context_vars/weeks_since_lmp_rounded_ctx  != 'unknown'"/>
@@ -1303,7 +1303,7 @@ selected(../pregnancy_summary/g_age_correct, 'no')"/>
       <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/new_edd" readonly="true()" type="string"/>
       <bind nodeset="/pregnancy_home_visit/update_g_age/update_summary/edd_check_note" readonly="true()" type="string"/>
       <bind nodeset="/pregnancy_home_visit/update_g_age/lmp_date_8601_new" type="string" calculate="format-date-time(
-if(selected(../update_method/g_age_update_method, 'method_weeks'), date-time(floor(decimal-date-time(today())) - (../update_method/lmp_weeks_new * 7)), 
+if(selected(../update_method/g_age_update_method, 'method_weeks'), date-time(decimal-date-time(today()) - (../update_method/lmp_weeks_new * 7)), 
 if(selected(../update_method/g_age_update_method, 'method_edd'), date-time(decimal-date-time(../update_method/u_edd_new) - 280), 0)
 ), &quot;%Y-%m-%d&quot;)"/>
       <bind nodeset="/pregnancy_home_visit/update_g_age/lmp_date_new" type="string" calculate="format-date-time(../lmp_date_8601_new, &quot;%e %b, %Y&quot;)"/>
@@ -1316,13 +1316,13 @@ if(selected(../update_method/g_age_update_method, 'method_edd'), date-time(decim
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/report_other_visits" type="select1" required="true()"/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count" type="int" required="true()" constraint=".&gt;= 0 and . &lt;= 9" jr:constraintMsg="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count:jr:constraintMsg')" relevant="selected(../report_other_visits, 'yes')"/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_ask_single" type="select1" required="true()" relevant=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count  = 1"/>
-      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_single" type="date" required="true()" constraint="decimal-date-time(.) &lt;= floor(decimal-date-time(today())) and decimal-date-time(.) &gt;= (decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ))" jr:constraintMsg="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_single:jr:constraintMsg')" relevant="selected(../visited_date_ask_single, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_single" type="date" relevant="selected(../visited_date_ask_single, 'yes')" constraint=". &lt;= today() and . &gt;=  /pregnancy_home_visit/lmp_date_8601 " required="true()" jr:constraintMsg="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_date_single:jr:constraintMsg')"/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates_multiple_note" readonly="true()" type="string" relevant=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count  &gt; 1"/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates_multiple_note_section" readonly="true()" type="string" relevant=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count  &gt; 1"/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates_count" type="string" readonly="true()" calculate=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count "/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates" relevant=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count  &gt; 1"/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date_ask_multiple" type="select1" required="true()" relevant=" /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_hf_count  &gt; 1"/>
-      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date" type="date" required="true()" constraint="decimal-date-time(.) &lt;= floor(decimal-date-time(today())) and decimal-date-time(.) &gt;= (decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ))" jr:constraintMsg="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date:jr:constraintMsg')" relevant="selected(../visited_date_ask_multiple, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date" type="date" relevant="selected(../visited_date_ask_multiple, 'yes')" constraint=". &lt;= today() and . &gt;=  /pregnancy_home_visit/lmp_date_8601 " required="true()" jr:constraintMsg="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_past/visited_dates/visited_date:jr:constraintMsg')"/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/previous_risk_factors_note" readonly="true()" type="string"/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/no_previous_risks_note" readonly="true()" type="string" relevant="../../../context_vars/risk_factors_ctx = ''"/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/risk_factors/first_pregnancy_note" readonly="true()" type="string" relevant="contains(../../../context_vars/risk_factors_ctx, 'first_pregnancy')"/>
@@ -1348,8 +1348,8 @@ selected(../new_risks, 'diabetes') or
 selected(../additional_risk_check, 'yes')
 , 'yes', 'no')"/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known" type="select1" required="true()"/>
-      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date" type="date" required="true()" constraint="(decimal-date-time(.) &gt;= floor(decimal-date-time(today()))) and
-(decimal-date-time(.) &lt;= floor(decimal-date-time(today() + 30)))" jr:constraintMsg="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date:jr:constraintMsg')" relevant="selected(../appointment_date_known, 'yes')"/>
+      <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date" type="date" relevant="selected(../appointment_date_known, 'yes')" constraint="(. &gt;= today()) and
+(decimal-date-time(.) &lt;= decimal-date-time(today() + 30))" required="true()" jr:constraintMsg="jr:itext('/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date:jr:constraintMsg')"/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note" relevant="selected(../anc_next_visit_date/appointment_date_known, 'no')"/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/who_recommends_note" readonly="true()" type="string"/>
       <bind nodeset="/pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_visit_advice_note/prenancy_age_note" readonly="true()" type="string"/>
@@ -1468,14 +1468,14 @@ selected(../../safe_pregnancy_practices/iron_folate/iron_folate_daily, 'no')"/>
       <bind nodeset="/pregnancy_home_visit/summary/r_fup_hf_visit" readonly="true()" type="string" relevant="selected(../../anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date_known, 'yes')"/>
       <bind nodeset="/pregnancy_home_visit/summary/r_fup_pregnancy_visit" readonly="true()" type="string" relevant="../../lmp_date_8601 != ''"/>
       <bind nodeset="/pregnancy_home_visit/summary/r_fup_pregnancy_visit_2_weeks" readonly="true()" type="string" relevant="../../lmp_date_8601 = ''"/>
-      <bind nodeset="/pregnancy_home_visit/summary/next_visit_weeks" type="string" calculate="round((if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 12*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 12*7,
-if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 20*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 20*7,
-if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 26*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 26*7,
-if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 30*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 30*7,
-if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 34*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 34*7,
-if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 36*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 36*7,
-if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 38*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 38*7,
-if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 40*7) &gt; floor(decimal-date-time(today())), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 40*7, 0
+      <bind nodeset="/pregnancy_home_visit/summary/next_visit_weeks" type="string" calculate="round((if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 12*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 12*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 20*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 20*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 26*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 26*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 30*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 30*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 34*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 34*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 36*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 36*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 38*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 38*7,
+if((decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 40*7) &gt; decimal-date-time(today()), decimal-date-time( /pregnancy_home_visit/lmp_date_8601 ) + 40*7, 0
 )))))))) - decimal-date-time(today())) div 7, 0)"/>
       <bind nodeset="/pregnancy_home_visit/summary/edd_summary" type="string" calculate="format-date-time( /pregnancy_home_visit/edd_8601 , &quot;%e %b, %Y&quot;)"/>
       <bind nodeset="/pregnancy_home_visit/summary/next_appointment_date" type="string" calculate="format-date-time( /pregnancy_home_visit/anc_visits_hf/anc_visits_hf_next/anc_next_visit_date/appointment_date , &quot;%e %b, %Y&quot;)"/>
diff --git a/config/default/forms/contact/PLACE_TYPE-create.xlsx b/config/default/forms/contact/PLACE_TYPE-create.xlsx
index 77e8474e96d..5a2b509cdb2 100644
Binary files a/config/default/forms/contact/PLACE_TYPE-create.xlsx and b/config/default/forms/contact/PLACE_TYPE-create.xlsx differ
diff --git a/config/default/forms/contact/clinic-create.xml b/config/default/forms/contact/clinic-create.xml
index 686ae58e76d..ef4b7534b66 100644
--- a/config/default/forms/contact/clinic-create.xml
+++ b/config/default/forms/contact/clinic-create.xml
@@ -915,7 +915,7 @@ DOB ISO: <output value=" /data/contact/ephemeral_dob/dob_iso "/></value></text>
         </translation>
       </itext>
       <instance>
-        <data id="contact:clinic:create" prefix="J1!contact:clinic:create!" delimiter="#" version="2022-08-24 11-44">
+        <data id="contact:clinic:create" prefix="J1!contact:clinic:create!" delimiter="#" version="2022-09-26 12-17">
           <inputs>
             <meta>
               <location>
@@ -1017,7 +1017,7 @@ DOB ISO: <output value=" /data/contact/ephemeral_dob/dob_iso "/></value></text>
       <bind nodeset="/data/contact/short_name" type="string" jr:constraintMsg="Short name can not be more than 10 characters long." constraint="string-length(.) &lt;= 10" required="false()"/>
       <bind nodeset="/data/contact/date_of_birth" type="string" calculate="../ephemeral_dob/dob_iso" required="true()"/>
       <bind nodeset="/data/contact/date_of_birth_method" type="string" calculate="../ephemeral_dob/dob_method"/>
-      <bind nodeset="/data/contact/ephemeral_dob/dob_calendar" type="date" relevant="not(selected(../dob_method,'approx'))" jr:constraintMsg="Date must be before today" constraint="floor(decimal-date-time(.)) &lt;= floor(decimal-date-time(today()))" required="true()"/>
+      <bind nodeset="/data/contact/ephemeral_dob/dob_calendar" type="date" relevant="not(selected(../dob_method,'approx'))" required="true()" constraint=". &lt;= now()" jr:constraintMsg="Date must be before today"/>
       <bind nodeset="/data/contact/ephemeral_dob/age_label" readonly="true()" type="string" relevant="selected(../dob_method,'approx')"/>
       <bind nodeset="/data/contact/ephemeral_dob/age_years" type="int" relevant="selected(../dob_method,'approx')" jr:constraintMsg="Age must be between 0 and 130" constraint=". &gt;= 0 and . &lt;= 130" required="true()"/>
       <bind nodeset="/data/contact/ephemeral_dob/age_months" type="int" relevant="selected(../dob_method,'approx')" jr:constraintMsg="Months must between 0 and 11" constraint=". &gt;= 0 and . &lt;= 11"/>
diff --git a/config/default/forms/contact/district_hospital-create.xml b/config/default/forms/contact/district_hospital-create.xml
index 0938b12e88b..71a5b555e5d 100644
--- a/config/default/forms/contact/district_hospital-create.xml
+++ b/config/default/forms/contact/district_hospital-create.xml
@@ -915,7 +915,7 @@ DOB ISO: <output value=" /data/contact/ephemeral_dob/dob_iso "/></value></text>
         </translation>
       </itext>
       <instance>
-        <data id="contact:district_hospital:create" prefix="J1!contact:district_hospital:create!" delimiter="#" version="2022-08-24 11-44">
+        <data id="contact:district_hospital:create" prefix="J1!contact:district_hospital:create!" delimiter="#" version="2022-09-26 12-17">
           <inputs>
             <meta>
               <location>
@@ -1017,7 +1017,7 @@ DOB ISO: <output value=" /data/contact/ephemeral_dob/dob_iso "/></value></text>
       <bind nodeset="/data/contact/short_name" type="string" constraint="string-length(.) &lt;= 10" jr:constraintMsg="Short name can not be more than 10 characters long." required="false()"/>
       <bind nodeset="/data/contact/date_of_birth" type="string" calculate="../ephemeral_dob/dob_iso" required="true()"/>
       <bind nodeset="/data/contact/date_of_birth_method" type="string" calculate="../ephemeral_dob/dob_method"/>
-      <bind nodeset="/data/contact/ephemeral_dob/dob_calendar" type="date" constraint="floor(decimal-date-time(.)) &lt;= floor(decimal-date-time(today()))" jr:constraintMsg="Date must be before today" relevant="not(selected(../dob_method,'approx'))" required="true()"/>
+      <bind nodeset="/data/contact/ephemeral_dob/dob_calendar" type="date" constraint=". &lt;= now()" required="true()" jr:constraintMsg="Date must be before today" relevant="not(selected(../dob_method,'approx'))"/>
       <bind nodeset="/data/contact/ephemeral_dob/age_label" readonly="true()" type="string" relevant="selected(../dob_method,'approx')"/>
       <bind nodeset="/data/contact/ephemeral_dob/age_years" type="int" constraint=". &gt;= 0 and . &lt;= 130" jr:constraintMsg="Age must be between 0 and 130" relevant="selected(../dob_method,'approx')" required="true()"/>
       <bind nodeset="/data/contact/ephemeral_dob/age_months" type="int" constraint=". &gt;= 0 and . &lt;= 11" jr:constraintMsg="Months must between 0 and 11" relevant="selected(../dob_method,'approx')"/>
diff --git a/config/default/forms/contact/health_center-create.xml b/config/default/forms/contact/health_center-create.xml
index 1ba2bde94e8..496102b5014 100644
--- a/config/default/forms/contact/health_center-create.xml
+++ b/config/default/forms/contact/health_center-create.xml
@@ -915,7 +915,7 @@ DOB ISO: <output value=" /data/contact/ephemeral_dob/dob_iso "/></value></text>
         </translation>
       </itext>
       <instance>
-        <data id="contact:health_center:create" prefix="J1!contact:health_center:create!" delimiter="#" version="2022-08-24 11-44">
+        <data id="contact:health_center:create" prefix="J1!contact:health_center:create!" delimiter="#" version="2022-09-26 12-17">
           <inputs>
             <meta>
               <location>
@@ -1017,7 +1017,7 @@ DOB ISO: <output value=" /data/contact/ephemeral_dob/dob_iso "/></value></text>
       <bind nodeset="/data/contact/short_name" type="string" jr:constraintMsg="Short name can not be more than 10 characters long." required="false()" constraint="string-length(.) &lt;= 10"/>
       <bind nodeset="/data/contact/date_of_birth" type="string" calculate="../ephemeral_dob/dob_iso" required="true()"/>
       <bind nodeset="/data/contact/date_of_birth_method" type="string" calculate="../ephemeral_dob/dob_method"/>
-      <bind nodeset="/data/contact/ephemeral_dob/dob_calendar" type="date" relevant="not(selected(../dob_method,'approx'))" jr:constraintMsg="Date must be before today" required="true()" constraint="floor(decimal-date-time(.)) &lt;= floor(decimal-date-time(today()))"/>
+      <bind nodeset="/data/contact/ephemeral_dob/dob_calendar" type="date" constraint=". &lt;= now()" relevant="not(selected(../dob_method,'approx'))" required="true()" jr:constraintMsg="Date must be before today"/>
       <bind nodeset="/data/contact/ephemeral_dob/age_label" readonly="true()" type="string" relevant="selected(../dob_method,'approx')"/>
       <bind nodeset="/data/contact/ephemeral_dob/age_years" type="int" relevant="selected(../dob_method,'approx')" jr:constraintMsg="Age must be between 0 and 130" required="true()" constraint=". &gt;= 0 and . &lt;= 130"/>
       <bind nodeset="/data/contact/ephemeral_dob/age_months" type="int" relevant="selected(../dob_method,'approx')" constraint=". &gt;= 0 and . &lt;= 11" jr:constraintMsg="Months must between 0 and 11"/>
diff --git a/config/default/forms/contact/person-create.xlsx b/config/default/forms/contact/person-create.xlsx
index 6d6f5ea9af8..ff9c1030233 100644
Binary files a/config/default/forms/contact/person-create.xlsx and b/config/default/forms/contact/person-create.xlsx differ
diff --git a/config/default/forms/contact/person-create.xml b/config/default/forms/contact/person-create.xml
index 93f4eb395b6..10d20b36a41 100644
--- a/config/default/forms/contact/person-create.xml
+++ b/config/default/forms/contact/person-create.xml
@@ -807,7 +807,7 @@ DOB ISO: <output value=" /data/person/ephemeral_dob/dob_iso "/></value></text>
         </translation>
       </itext>
       <instance>
-        <data id="contact:person:create" prefix="J1!contact:person:create!" delimiter="#" version="2022-08-24 11-45">
+        <data id="contact:person:create" prefix="J1!contact:person:create!" delimiter="#" version="2022-09-26 12-15">
           <inputs>
             <meta>
               <location>
@@ -881,7 +881,7 @@ DOB ISO: <output value=" /data/person/ephemeral_dob/dob_iso "/></value></text>
       <bind nodeset="/data/person/short_name" type="string" jr:constraintMsg="jr:itext('/data/person/short_name:jr:constraintMsg')" constraint="string-length(.) &lt;= 10" required="false()"/>
       <bind nodeset="/data/person/date_of_birth" type="string" calculate="../ephemeral_dob/dob_iso" required="true()"/>
       <bind nodeset="/data/person/date_of_birth_method" type="string" calculate="../ephemeral_dob/dob_method"/>
-      <bind nodeset="/data/person/ephemeral_dob/dob_calendar" type="date" jr:constraintMsg="jr:itext('/data/person/ephemeral_dob/dob_calendar:jr:constraintMsg')" relevant="not(selected(../dob_method,'approx'))" constraint="floor(decimal-date-time(.)) &lt;= floor(decimal-date-time(today()))" required="true()"/>
+      <bind nodeset="/data/person/ephemeral_dob/dob_calendar" type="date" relevant="not(selected(../dob_method,'approx'))" jr:constraintMsg="jr:itext('/data/person/ephemeral_dob/dob_calendar:jr:constraintMsg')" required="true()" constraint=". &lt;= now()"/>
       <bind nodeset="/data/person/ephemeral_dob/age_label" readonly="true()" type="string" relevant="selected(../dob_method,'approx')"/>
       <bind nodeset="/data/person/ephemeral_dob/age_years" type="int" jr:constraintMsg="jr:itext('/data/person/ephemeral_dob/age_years:jr:constraintMsg')" relevant="selected(../dob_method,'approx')" constraint=". &gt;= 0 and . &lt;= 130" required="true()"/>
       <bind nodeset="/data/person/ephemeral_dob/age_months" type="int" jr:constraintMsg="jr:itext('/data/person/ephemeral_dob/age_months:jr:constraintMsg')" relevant="selected(../dob_method,'approx')" constraint=". &gt;= 0 and . &lt;= 11"/>
diff --git a/config/default/forms/contact/person-edit.xlsx b/config/default/forms/contact/person-edit.xlsx
index 2a0ebcd038a..45667c39ad7 100644
Binary files a/config/default/forms/contact/person-edit.xlsx and b/config/default/forms/contact/person-edit.xlsx differ
diff --git a/config/default/forms/contact/person-edit.xml b/config/default/forms/contact/person-edit.xml
index f1f52514df9..3f1389dfb8f 100644
--- a/config/default/forms/contact/person-edit.xml
+++ b/config/default/forms/contact/person-edit.xml
@@ -933,7 +933,7 @@ DOB ISO: <output value=" /data/person/ephemeral_dob/dob_iso "/></value></text>
         </translation>
       </itext>
       <instance>
-        <data id="contact:person:edit" prefix="J1!contact:person:edit!" delimiter="#" version="2022-08-24 11-46">
+        <data id="contact:person:edit" prefix="J1!contact:person:edit!" delimiter="#" version="2022-09-26 12-17">
           <inputs>
             <meta>
               <location>
@@ -1024,7 +1024,7 @@ DOB ISO: <output value=" /data/person/ephemeral_dob/dob_iso "/></value></text>
       <bind nodeset="/data/person/short_name" type="string" jr:constraintMsg="jr:itext('/data/person/short_name:jr:constraintMsg')" required="false()" constraint="string-length(.) &lt;= 10"/>
       <bind nodeset="/data/person/date_of_birth" type="string" calculate="../ephemeral_dob/dob_iso" required="true()"/>
       <bind nodeset="/data/person/date_of_birth_method" type="string" calculate="../ephemeral_dob/dob_method"/>
-      <bind nodeset="/data/person/ephemeral_dob/dob_calendar" type="date" relevant="not(selected(../dob_method,'approx'))" required="true()" jr:constraintMsg="jr:itext('/data/person/ephemeral_dob/dob_calendar:jr:constraintMsg')" constraint="floor(decimal-date-time(.)) &lt;= floor(decimal-date-time(today()))"/>
+      <bind nodeset="/data/person/ephemeral_dob/dob_calendar" type="date" jr:constraintMsg="jr:itext('/data/person/ephemeral_dob/dob_calendar:jr:constraintMsg')" relevant="not(selected(../dob_method,'approx'))" constraint=". &lt;= now()" required="true()"/>
       <bind nodeset="/data/person/ephemeral_dob/age_label" readonly="true()" type="string" relevant="selected(../dob_method,'approx')"/>
       <bind nodeset="/data/person/ephemeral_dob/age_years" type="int" relevant="selected(../dob_method,'approx')" required="true()" jr:constraintMsg="jr:itext('/data/person/ephemeral_dob/age_years:jr:constraintMsg')" constraint=". &gt;= 0 and . &lt;= 130"/>
       <bind nodeset="/data/person/ephemeral_dob/age_months" type="int" relevant="selected(../dob_method,'approx')" jr:constraintMsg="jr:itext('/data/person/ephemeral_dob/age_months:jr:constraintMsg')" constraint=". &gt;= 0 and . &lt;= 11"/>
diff --git a/config/standard/forms/app/death_confirmation.xlsx b/config/standard/forms/app/death_confirmation.xlsx
index a0c0f43f898..39d320005c8 100644
Binary files a/config/standard/forms/app/death_confirmation.xlsx and b/config/standard/forms/app/death_confirmation.xlsx differ
diff --git a/config/standard/forms/app/death_confirmation.xml b/config/standard/forms/app/death_confirmation.xml
index 218c09c5c37..5881e5713d6 100644
--- a/config/standard/forms/app/death_confirmation.xml
+++ b/config/standard/forms/app/death_confirmation.xml
@@ -327,7 +327,7 @@ Klik di sini untuk menelepon: <output value=" /death_confirmation/chw_phone "/>]
         </translation>
       </itext>
       <instance>
-        <death_confirmation id="death_confirmation" prefix="J1!death_confirmation!" delimiter="#" version="2019-05-10 10-56">
+        <death_confirmation id="death_confirmation" prefix="J1!death_confirmation!" delimiter="#" version="2022-09-26 12-31">
           <inputs>
             <meta>
               <location>
@@ -391,7 +391,7 @@ Klik di sini untuk menelepon: <output value=" /death_confirmation/chw_phone "/>]
       <bind nodeset="/death_confirmation/death_report/n_1" readonly="true()" type="string"/>
       <bind nodeset="/death_confirmation/death_report/n_2" readonly="true()" type="string"/>
       <bind nodeset="/death_confirmation/death_report/death" type="select1" required="true()"/>
-      <bind nodeset="/death_confirmation/death_report/date_of_death" type="date" required="true()" relevant=" /death_confirmation/death_report/death  = 'yes'"/>
+      <bind nodeset="/death_confirmation/death_report/date_of_death" type="date" required="true()" relevant=" /death_confirmation/death_report/death  = 'yes'" constraint=". &lt;= now()"/>
       <bind nodeset="/death_confirmation/death_report/place" type="select1" required="true()" relevant=" /death_confirmation/death_report/death  = 'yes'"/>
       <bind nodeset="/death_confirmation/death_report/other_place" type="string" required="true()" relevant=" /death_confirmation/death_report/place  = 'other'"/>
       <bind nodeset="/death_confirmation/death_report/n_3" readonly="true()" type="string" relevant=" /death_confirmation/death_report/death  = 'no'"/>
diff --git a/config/standard/forms/app/delivery.xlsx b/config/standard/forms/app/delivery.xlsx
index e0509e1655f..a1fd0664b15 100644
Binary files a/config/standard/forms/app/delivery.xlsx and b/config/standard/forms/app/delivery.xlsx differ
diff --git a/config/standard/forms/app/delivery.xml b/config/standard/forms/app/delivery.xml
index 137e343caff..e9ad45e410b 100644
--- a/config/standard/forms/app/delivery.xml
+++ b/config/standard/forms/app/delivery.xml
@@ -1428,7 +1428,7 @@ ID: <output value=" /delivery/group_summary/r_patient_id "/></value></text>
         </translation>
       </itext>
       <instance>
-        <delivery id="delivery" prefix="J1!delivery!" delimiter="#" version="2022-08-19 16-27">
+        <delivery id="delivery" prefix="J1!delivery!" delimiter="#" version="2022-09-26 12-56">
           <inputs>
             <meta>
               <location>
@@ -1553,7 +1553,7 @@ ID: <output value=" /delivery/group_summary/r_patient_id "/></value></text>
       <bind nodeset="/delivery/group_delivery_summary" relevant="selected(coalesce( /delivery/group_chw_info/still_pregnant , 'no'), 'no')"/>
       <bind nodeset="/delivery/group_delivery_summary/g_pregnancy_outcome" type="select1" required="true()"/>
       <bind nodeset="/delivery/group_delivery_summary/g_delivery_code" type="select1" required="true()" relevant=" /delivery/group_delivery_summary/g_pregnancy_outcome  != 'miscarriage'"/>
-      <bind nodeset="/delivery/group_delivery_summary/g_birth_date" type="date" constraint="(decimal-date-time(.) &lt;= decimal-date-time(today())) and ((decimal-date-time(today()) - decimal-date-time(.)) &lt; 365)" relevant=" /delivery/group_delivery_summary/g_pregnancy_outcome  != 'miscarriage'" jr:constraintMsg="jr:itext('/delivery/group_delivery_summary/g_birth_date:jr:constraintMsg')"/>
+      <bind nodeset="/delivery/group_delivery_summary/g_birth_date" type="date" jr:constraintMsg="jr:itext('/delivery/group_delivery_summary/g_birth_date:jr:constraintMsg')" relevant=" /delivery/group_delivery_summary/g_pregnancy_outcome  != 'miscarriage'" constraint="(decimal-date-time(.) &lt;= decimal-date-time(now())) and ((decimal-date-time(now()) - decimal-date-time(.)) &lt; 365)"/>
       <bind nodeset="/delivery/group_delivery_summary/display_birth_date" type="string" calculate="format-date ( /delivery/group_delivery_summary/g_birth_date , '%b %e, %Y')"/>
       <bind nodeset="/delivery/group_delivery_summary/display_delivery_outcome" type="string" calculate="jr:choice-name( /delivery/group_delivery_summary/g_pregnancy_outcome ,' /delivery/group_delivery_summary/g_pregnancy_outcome ')"/>
       <bind nodeset="/delivery/group_note/default_chw_sms" type="select1" calculate="if(coalesce( /delivery/group_chw_info/still_pregnant , 'no') = 'yes',
diff --git a/config/standard/forms/app/pregnancy.xlsx b/config/standard/forms/app/pregnancy.xlsx
index 7b6cfc2760a..f0704d712f4 100644
Binary files a/config/standard/forms/app/pregnancy.xlsx and b/config/standard/forms/app/pregnancy.xlsx differ
diff --git a/config/standard/forms/app/pregnancy.xml b/config/standard/forms/app/pregnancy.xml
index 082fe010482..9a160c1a60e 100644
--- a/config/standard/forms/app/pregnancy.xml
+++ b/config/standard/forms/app/pregnancy.xml
@@ -2085,7 +2085,7 @@ Tanggal taksiran persalinan: <output value=" /pregnancy/group_lmp/g_edd "/></val
         </translation>
       </itext>
       <instance>
-        <pregnancy id="pregnancy" prefix="J1!pregnancy!" delimiter="#" version="2018-11-14_10-23">
+        <pregnancy id="pregnancy" prefix="J1!pregnancy!" delimiter="#" version="2022-09-26 12-39">
           <inputs>
             <meta>
               <location>
@@ -2221,7 +2221,7 @@ Tanggal taksiran persalinan: <output value=" /pregnancy/group_lmp/g_edd "/></val
       <bind nodeset="/pregnancy/days_since_lmp" type="string" calculate="round(decimal-date-time(today()) - decimal-date-time( /pregnancy/group_lmp/g_lmp_date_8601 ), 2)"/>
       <bind nodeset="/pregnancy/weeks_since_lmp" type="string" calculate="round( /pregnancy/days_since_lmp  div 7, 2)"/>
       <bind nodeset="/pregnancy/group_lmp/g_lmp_method" type="select1" required="true()"/>
-      <bind nodeset="/pregnancy/group_lmp/g_lmp_calendar" type="date" jr:constraintMsg="jr:itext('/pregnancy/group_lmp/g_lmp_calendar:jr:constraintMsg')" required="true()" constraint=".&lt;today() and ((decimal-date-time(.)+294) &gt;= decimal-date-time(today()))" relevant="selected( /pregnancy/group_lmp/g_lmp_method ,'calendar')"/>
+      <bind nodeset="/pregnancy/group_lmp/g_lmp_calendar" type="date" constraint=". &lt; now() and ((decimal-date-time(.)+294) &gt;= decimal-date-time(today()))" relevant="selected( /pregnancy/group_lmp/g_lmp_method ,'calendar')" jr:constraintMsg="jr:itext('/pregnancy/group_lmp/g_lmp_calendar:jr:constraintMsg')" required="true()"/>
       <bind nodeset="/pregnancy/group_lmp/g_lmp_approx" type="select1" relevant="selected( /pregnancy/group_lmp/g_lmp_method ,'approx')" required="true()"/>
       <bind nodeset="/pregnancy/group_lmp/g_lmp_date_raw" type="string" calculate="if(selected(  /pregnancy/group_lmp/g_lmp_method ,'calendar'),  /pregnancy/group_lmp/g_lmp_calendar ,date-time(decimal-date-time(today()- /pregnancy/group_lmp/g_lmp_approx )))"/>
       <bind nodeset="/pregnancy/group_lmp/g_lmp_date_8601" type="string" calculate="format-date-time(if(selected(  /pregnancy/group_lmp/g_lmp_method ,'calendar'),  /pregnancy/group_lmp/g_lmp_calendar ,date-time(decimal-date-time(today()- /pregnancy/group_lmp/g_lmp_approx ))),&quot;%Y-%m-%d&quot;)"/>
diff --git a/config/standard/forms/collect/child.xlsx b/config/standard/forms/collect/child.xlsx
index bc07aa4e80f..05022c23352 100644
Binary files a/config/standard/forms/collect/child.xlsx and b/config/standard/forms/collect/child.xlsx differ
diff --git a/config/standard/forms/collect/child.xml b/config/standard/forms/collect/child.xml
index a54760648b3..ff7491255d1 100644
--- a/config/standard/forms/collect/child.xml
+++ b/config/standard/forms/collect/child.xml
@@ -106,7 +106,7 @@
         </translation>
       </itext>
       <instance>
-        <child id="child" prefix="J1!child!" delimiter="#" version="2018-09-27_07-24">
+        <child id="child" prefix="J1!child!" delimiter="#" version="2022-09-26 12-41">
           <n/>
           <w/>
           <d/>
@@ -120,7 +120,7 @@
       <bind nodeset="/child/n" type="string" required="true()"/>
       <bind nodeset="/child/w" type="string" calculate="round(  /child/d  div 7, 0 )" required="true()"/>
       <bind nodeset="/child/d" type="string" calculate="today() -  /child/birth_date "/>
-      <bind nodeset="/child/birth_date" type="date" jr:constraintMsg="jr:itext('/child/birth_date:jr:constraintMsg')" constraint=". &lt;= today()" required="true()"/>
+      <bind nodeset="/child/birth_date" type="date" required="true()" jr:constraintMsg="jr:itext('/child/birth_date:jr:constraintMsg')" constraint=". &lt;= now()"/>
       <bind nodeset="/child/review" readonly="true()" type="string"/>
       <bind nodeset="/child/meta/instanceID" type="string" readonly="true()" calculate="concat('uuid:', uuid())"/>
     </model>
diff --git a/config/standard/forms/contact/person-create.xlsx b/config/standard/forms/contact/person-create.xlsx
index 238d35766f4..a95996e1b03 100644
Binary files a/config/standard/forms/contact/person-create.xlsx and b/config/standard/forms/contact/person-create.xlsx differ
diff --git a/config/standard/forms/contact/person-create.xml b/config/standard/forms/contact/person-create.xml
index f274a7cd0e2..d7d91c608c7 100644
--- a/config/standard/forms/contact/person-create.xml
+++ b/config/standard/forms/contact/person-create.xml
@@ -576,7 +576,7 @@
         </translation>
       </itext>
       <instance>
-        <data id="contact:person:create" prefix="J1!contact:person:create!" delimiter="#" version="2019-01-22_12-31">
+        <data id="contact:person:create" prefix="J1!contact:person:create!" delimiter="#" version="2022-09-26 12-44">
           <inputs>
             <meta>
               <location>
@@ -626,7 +626,7 @@
       <bind nodeset="/data/inputs/user/contact_id" type="string"/>
       <bind nodeset="/data/inputs/user/facility_id" type="string"/>
       <bind nodeset="/data/inputs/user/name" type="string"/>
-      <bind nodeset="/data/init/parent_id" type="string" readonly="true()" calculate=" /data/person/parent "/>
+      <bind nodeset="/data/init/parent_id" type="string" calculate=" /data/person/parent " readonly="true()"/>
       <bind nodeset="/data/init/name" type="string"/>
       <bind nodeset="/data/init/type" type="string"/>
       <bind nodeset="/data/init/type_selector" type="select1" calculate="../type"/>
@@ -634,7 +634,7 @@
       <bind nodeset="/data/person/parent" type="string"/>
       <bind nodeset="/data/person/type" type="string"/>
       <bind nodeset="/data/person/name" type="string" required="true()"/>
-      <bind nodeset="/data/person/date_of_birth" type="date" jr:constraintMsg="jr:itext('/data/person/date_of_birth:jr:constraintMsg')" constraint=". &lt;= today()"/>
+      <bind nodeset="/data/person/date_of_birth" type="date" constraint=". &lt;= now()" jr:constraintMsg="jr:itext('/data/person/date_of_birth:jr:constraintMsg')"/>
       <bind nodeset="/data/person/phone" type="tel" jr:constraintMsg="jr:itext('/data/person/phone:jr:constraintMsg')" constraint="true()"/>
       <bind nodeset="/data/person/phone_alternate" type="tel" jr:constraintMsg="jr:itext('/data/person/phone_alternate:jr:constraintMsg')" constraint="true()"/>
       <bind nodeset="/data/person/sex" type="select1"/>
diff --git a/config/standard/forms/contact/person-edit.xlsx b/config/standard/forms/contact/person-edit.xlsx
index 9760c229068..c4c06a89c85 100644
Binary files a/config/standard/forms/contact/person-edit.xlsx and b/config/standard/forms/contact/person-edit.xlsx differ
diff --git a/config/standard/forms/contact/person-edit.xml b/config/standard/forms/contact/person-edit.xml
index c3cd2d852aa..410592b1a55 100644
--- a/config/standard/forms/contact/person-edit.xml
+++ b/config/standard/forms/contact/person-edit.xml
@@ -666,7 +666,7 @@
         </translation>
       </itext>
       <instance>
-        <data id="contact:person:edit" prefix="J1!contact:person:edit!" delimiter="#" version="2019-01-22_12-31">
+        <data id="contact:person:edit" prefix="J1!contact:person:edit!" delimiter="#" version="2022-09-26 12-46">
           <inputs>
             <meta>
               <location>
@@ -741,7 +741,7 @@
       <bind nodeset="/data/person/_id" type="string" readonly="true()"/>
       <bind nodeset="/data/person/type" type="string" readonly="true()"/>
       <bind nodeset="/data/person/name" type="string" required="true()"/>
-      <bind nodeset="/data/person/date_of_birth" type="date" jr:constraintMsg="jr:itext('/data/person/date_of_birth:jr:constraintMsg')" constraint=". &lt;= today()"/>
+      <bind nodeset="/data/person/date_of_birth" type="date" constraint=". &lt;= now()" jr:constraintMsg="jr:itext('/data/person/date_of_birth:jr:constraintMsg')"/>
       <bind nodeset="/data/person/phone" type="tel" jr:constraintMsg="jr:itext('/data/person/phone:jr:constraintMsg')" constraint="true()"/>
       <bind nodeset="/data/person/phone_alternate" type="tel" jr:constraintMsg="jr:itext('/data/person/phone_alternate:jr:constraintMsg')" constraint="true()"/>
       <bind nodeset="/data/person/sex" type="select1"/>
diff --git a/webapp/src/js/enketo/medic-xpath-extensions.js b/webapp/src/js/enketo/medic-xpath-extensions.js
index 7a109c7ff90..f76227b35af 100644
--- a/webapp/src/js/enketo/medic-xpath-extensions.js
+++ b/webapp/src/js/enketo/medic-xpath-extensions.js
@@ -153,9 +153,6 @@ module.exports = {
   },
   func: {
     'add-date': addDate,
-    today: function() {
-      return XPR.date(new Date());
-    },
     'z-score': function() {
       const args = Array.from(arguments).map(function(arg) {
         return getValue(arg);
diff --git a/webapp/tests/karma/js/enketo/medic-xpath-extensions.spec.ts b/webapp/tests/karma/js/enketo/medic-xpath-extensions.spec.ts
index d043dc9e6e9..f4d451e1cd7 100644
--- a/webapp/tests/karma/js/enketo/medic-xpath-extensions.spec.ts
+++ b/webapp/tests/karma/js/enketo/medic-xpath-extensions.spec.ts
@@ -10,7 +10,6 @@ describe('Medic XPath Extensions', () => {
     expect(medicXpathExtensions.init).to.be.a('function');
 
     expect(medicXpathExtensions.func).to.not.be.undefined;
-    expect(medicXpathExtensions.func.today).to.be.a('function');
     expect(medicXpathExtensions.func['z-score']).to.be.a('function');
     expect(medicXpathExtensions.func['parse-timestamp-to-date']).to.be.a('function');
 
diff --git a/webapp/tests/mocha/unit/enketo/medic-xpath-extensions.spec.js b/webapp/tests/mocha/unit/enketo/medic-xpath-extensions.spec.js
index 048f81423eb..5715b5da8a3 100644
--- a/webapp/tests/mocha/unit/enketo/medic-xpath-extensions.spec.js
+++ b/webapp/tests/mocha/unit/enketo/medic-xpath-extensions.spec.js
@@ -14,16 +14,6 @@ describe('medic-xpath-extensions', function() {
     done();
   });
 
-  describe('today()', function() {
-    it('returns a result of type `date`', function() {
-      assert.equal(func.today().t, 'date');
-    });
-
-    it('returns a value which is instance of Date', function() {
-      assert.ok(func.today().v instanceof Date);
-    });
-  });
-
   describe('getTimezoneOffsetAsTime()', function() {
     it('returns the time zone offset in hours when given a time zone difference in minutes', function() {
       Date.prototype.getTimezoneOffset = () => -60;