From 1a9f17b053109ffb688b844b23624358eea892cb Mon Sep 17 00:00:00 2001
From: Nethmi Rodrigo <34070216+NethmiRodrigo@users.noreply.github.com>
Date: Fri, 1 Nov 2024 11:20:53 +0530
Subject: [PATCH] (fix) Revert version updates and fix form logic (#28)

* (fix) Revert version updates

* (fix) Remove patient labs app

* (fix) Fix logic in forms
---
 Dockerfile                                    |   2 +-
 .../DRC Clinical Visit Form v2.2.json         | 389 ++++++++----------
 .../DRC HIV Enrolment Form v1.2.json          | 237 ++++++-----
 .../ampathforms/ct_death_v1.0.json            |  82 ++--
 .../ampathforms/ct_service_delivery_v1.0.json |  94 ++---
 .../ampathforms/ct_transfer_out_v1.0.json     |  73 ++--
 .../globalproperties-core_demo.xml            |   2 +-
 distro/pom.xml                                |  20 +-
 pom.xml                                       |   4 +-
 9 files changed, 417 insertions(+), 486 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7e10eecdc..82c70b633 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ### Dev Stage
-FROM openmrs/openmrs-core:dev-amazoncorretto-11 AS dev
+FROM openmrs/openmrs-core:dev-amazoncorretto-11 as dev
 WORKDIR /openmrs_distro
 
 ARG MVN_ARGS_SETTINGS="-s /usr/share/maven/ref/settings-docker.xml -U -P distro"
diff --git a/distro/configuration/ampathforms/DRC Clinical Visit Form v2.2.json b/distro/configuration/ampathforms/DRC Clinical Visit Form v2.2.json
index 6bc0544c2..67b9e13c5 100644
--- a/distro/configuration/ampathforms/DRC Clinical Visit Form v2.2.json	
+++ b/distro/configuration/ampathforms/DRC Clinical Visit Form v2.2.json	
@@ -19,8 +19,7 @@
               "datePickerFormat": "both",
               "questionOptions": {
                 "rendering": "datetime"
-              },
-              "validators": []
+              }
             },
             {
               "label": "Scheduled visit",
@@ -68,6 +67,7 @@
             {
               "label": "Visit type",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "radio",
                 "concept": "8a9809e9-8a0b-4e0e-b1f6-80b0cbbe361b",
@@ -105,7 +105,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true"
                 }
               ],
@@ -146,9 +145,9 @@
               "label": "Presenting complaints",
               "type": "obs",
               "required": false,
-              "id": "presentingComplaint",
+              "id": "presentingComplaintsList",
               "questionOptions": {
-                "rendering": "checkbox",
+                "rendering": "checkbox-searchable",
                 "concept": "f2ff2d1c-25e6-4143-9000-89633a932c2f",
                 "answers": [
                   {
@@ -640,6 +639,9 @@
                     "conceptMappings": []
                   }
                 ]
+              },
+              "hide": {
+                "hideWhenExpression": "presentingComplaints !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3' "
               }
             },
             {
@@ -649,14 +651,9 @@
                 "rendering": "textarea",
                 "concept": "160531AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
               },
-              "behaviours": [
-                {
-                  "intent": "*",
-                  "hide": {
-                    "hideWhenExpression": "presentingComplaints !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'"
-                  }
-                }
-              ],
+              "hide": {
+                "hideWhenExpression": "presentingComplaints !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'"
+              },
               "id": "presentingComplaintNotes"
             },
             {
@@ -1135,12 +1132,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "menstruationStatus === '1434AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "menstruationStatus === '1434AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "pregnancyIntention"
             },
             {
@@ -1293,12 +1290,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "menstruationStatus === '1434AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "menstruationStatus === '1434AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "OnFamilyPlanning"
             },
             {
@@ -1967,12 +1964,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "OnFamilyPlanning === '160652AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "OnFamilyPlanning === '160652AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "familyPlanningMethod"
             },
             {
@@ -2039,12 +2036,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "OnFamilyPlanning !== '160652AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "OnFamilyPlanning !== '160652AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "reasonNotOnFP"
             }
           ],
@@ -2107,6 +2104,7 @@
             {
               "label": "Gestational age (weeks)",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "number",
                 "concept": "1438AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
@@ -2114,18 +2112,18 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "menstruationStatus !== '1434AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "menstruationStatus !== '1434AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "gestationInWeeks"
             },
             {
               "label": "Antenatal profile done",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "radio",
                 "concept": "975f11e5-7471-4e57-bba7-d3ee358ef7ea",
@@ -2168,13 +2166,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "menstruationStatus !== '1434AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "menstruationStatus !== '1434AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "antenatalProfileDone"
             }
           ],
@@ -2248,6 +2245,7 @@
             {
               "label": "Cervical cancer screening method",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "checkbox",
                 "concept": "53ff5cd0-0f37-4190-87b1-9eb439a15e94",
@@ -2348,13 +2346,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "screenedForCervicalCancer !== '165619AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "screenedForCervicalCancer !== '165619AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "methodCervicalCancerScreen"
             }
           ]
@@ -2532,7 +2529,6 @@
           "behaviours": [
             {
               "intent": "*",
-              "required": "true",
               "unspecified": "true",
               "hide": {
                 "hideWhenExpression": "screenedForCervicalCancer !== '165619AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
@@ -2552,6 +2548,7 @@
             {
               "label": "Currently on treatment for tuberculosis",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "radio",
                 "concept": "159798AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -2693,18 +2690,18 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "currentTPT === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "currentTPT === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "onTBRx"
             },
             {
               "label": "Currently on tuberculosis prophylaxis treatment (TPT)",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "radio",
                 "concept": "166449AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -2846,18 +2843,18 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "currentTPT"
             },
             {
               "label": "Previously completed Tuberculosis preventive treatment",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "radio",
                 "concept": "166463AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -2995,7 +2992,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true"
                 }
               ],
@@ -3119,13 +3115,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "patientScreenedForTB"
             },
             {
@@ -3220,13 +3215,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "false",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientScreenedForTB !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientScreenedForTB !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "tbICFAdult"
             },
             {
@@ -3325,13 +3319,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "false",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientScreenedForTB !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientScreenedForTB !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "tbICFPeads"
             },
             {
@@ -3436,13 +3429,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "false",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientScreenedForTB !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientScreenedForTB !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "tbScreeningOutcome"
             }
           ],
@@ -3736,12 +3728,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "evaluateForTPT !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "evaluateForTPT !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
+              },
               "id": "tptProphylaxisPlan"
             },
             {
@@ -3786,12 +3778,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "tptProphylaxisPlan !== '1256AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "tptProphylaxisPlan !== '1256AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "currentTPTRegimen"
             },
             {
@@ -3892,12 +3884,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "tptProphylaxisPlan !== '1257AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "tptProphylaxisPlan !== '1257AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
+              },
               "id": "tptAdherence"
             },
             {
@@ -4045,12 +4037,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "tptProphylaxisPlan !== '1260AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "tptProphylaxisPlan !== '1260AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "reasonTptStopped"
             }
           ],
@@ -4070,6 +4062,7 @@
             {
               "label": "Tuberculosis treatment plan",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "radio",
                 "concept": "1268AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -4200,14 +4193,13 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "onTBRx === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
-              "id": "patientScreenedForTB"
+              "hide": {
+                "hideWhenExpression": "onTBRx === '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
+              "id": "patientScreenedForTBTreatment"
             },
             {
               "label": "Tuberculosis drug treatment start date",
@@ -4394,12 +4386,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "tbScreeningOutcome === '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "tbScreeningOutcome === '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "presumptiveTB"
             },
             {
@@ -4434,14 +4426,9 @@
                   }
                 ]
               },
-              "behaviours": [
-                {
-                  "intent": "*",
-                  "hide": {
-                    "hideWhenExpression": "tbScreeningOutcome === '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
-                }
-              ],
+              "hide": {
+                "hideWhenExpression": "tbScreeningOutcome === '664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || onTBRx === '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "tbNotes"
             }
           ],
@@ -5194,12 +5181,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "!includes('genExam', '135488AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "!includes('genExam', '135488AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
+              },
               "id": "lymphadenopathy"
             }
           ]
@@ -5301,14 +5288,9 @@
                   }
                 ]
               },
-              "behaviours": [
-                {
-                  "intent": "*",
-                  "hide": {
-                    "hideWhenExpression": "hEENTROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
-                }
-              ],
+              "hide": {
+                "hideWhenExpression": "hEENTROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "otherHEENTExaminationFinding"
             },
             {
@@ -5404,14 +5386,9 @@
                   }
                 ]
               },
-              "behaviours": [
-                {
-                  "intent": "*",
-                  "hide": {
-                    "hideWhenExpression": "respiratoryROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
-                }
-              ],
+              "hide": {
+                "hideWhenExpression": "respiratoryROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "otherRespiratoryFinding"
             },
             {
@@ -5503,14 +5480,9 @@
                   }
                 ]
               },
-              "behaviours": [
-                {
-                  "intent": "*",
-                  "hide": {
-                    "hideWhenExpression": "cardiovascularROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
-                }
-              ],
+              "hide": {
+                "hideWhenExpression": "cardiovascularROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "otherCardiovascularExaminationFinding"
             },
             {
@@ -5606,14 +5578,9 @@
                   }
                 ]
               },
-              "behaviours": [
-                {
-                  "intent": "*",
-                  "hide": {
-                    "hideWhenExpression": "AbdominalROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
-                }
-              ],
+              "hide": {
+                "hideWhenExpression": "AbdominalROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "otherAbdominalExaminationFinding"
             },
             {
@@ -5705,14 +5672,9 @@
                   }
                 ]
               },
-              "behaviours": [
-                {
-                  "intent": "*",
-                  "hide": {
-                    "hideWhenExpression": "cnsROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
-                }
-              ],
+              "hide": {
+                "hideWhenExpression": "cnsROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "otherCNSExaminationFinding"
             },
             {
@@ -5804,14 +5766,9 @@
                   }
                 ]
               },
-              "behaviours": [
-                {
-                  "intent": "*",
-                  "hide": {
-                    "hideWhenExpression": "musculoskeletalSROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
-                }
-              ],
+              "hide": {
+                "hideWhenExpression": "musculoskeletalSROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "otherMusculoskeletalExaminationFinding"
             },
             {
@@ -5903,14 +5860,9 @@
                   }
                 ]
               },
-              "behaviours": [
-                {
-                  "intent": "*",
-                  "hide": {
-                    "hideWhenExpression": "genitourinaryROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
-                }
-              ],
+              "hide": {
+                "hideWhenExpression": "genitourinaryROS === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "otherGenitoUrinaryExaminationFinding"
             }
           ]
@@ -6265,12 +6217,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "screeningSTI !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "screeningSTI !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "sTIOutcome"
             }
           ]
@@ -6282,6 +6234,7 @@
             {
               "label": "Current WHO HIV stage",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "radio",
                 "concept": "5356AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -6627,8 +6580,7 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "required": "true"
+                  "unspecified": "true"
                 }
               ],
               "id": "wHOStage"
@@ -6642,6 +6594,7 @@
             {
               "label": "Nutritional status ",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "radio",
                 "concept": "c481f80d-7553-41ab-94ca-efddb8ab294c",
@@ -6783,8 +6736,7 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "required": "true"
+                  "unspecified": "true"
                 }
               ],
               "id": "nutritionalStatus"
@@ -6929,12 +6881,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "nutritionalStatus === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || nutritionalStatus === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "nutritionalStatus === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || nutritionalStatus === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "nutritionalInterventions"
             },
             {
@@ -7123,12 +7075,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "nutritionalStatus === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || nutritionalStatus === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || nutritionalInterventions !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "nutritionalStatus === '1115AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || nutritionalStatus === '1118AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || nutritionalInterventions !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "nutritionalSupport"
             },
             {
@@ -7163,6 +7115,7 @@
             {
               "label": "New/Active opportunistic infection",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "radio",
                 "concept": "c52ecf45-bd6c-43ed-861b-9a2714878729",
@@ -7298,7 +7251,6 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true"
                 }
               ],
@@ -7531,12 +7483,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "hasOIs !== '131768AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "hasOIs !== '131768AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "typeOI"
             }
           ]
@@ -7831,12 +7783,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "pcpProphylaxis !== '1256AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "pcpProphylaxis !== '1256AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "pcpRegimen"
             },
             {
@@ -7937,12 +7889,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "pcpProphylaxis !== '1257AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && pcpProphylaxis !== '1260AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "pcpProphylaxis !== '1257AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && pcpProphylaxis !== '1260AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "pcpRegimenAdherence"
             },
             {
@@ -8064,12 +8016,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "pcpProphylaxis !== '1260AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "pcpProphylaxis !== '1260AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "pcpStop"
             }
           ]
@@ -8720,12 +8672,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "artAdherenceAssessment === '159405AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || artAdherenceAssessment === '1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "artAdherenceAssessment === '159405AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || artAdherenceAssessment === '1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "reasonForPoorAdherenceToHaart"
             }
           ]
@@ -8739,7 +8691,9 @@
               "required": false,
               "id": "labsAndDrugOrders",
               "questionOptions": {
-                "rendering": "workspace-launcher"
+                "rendering": "workspace-launcher",
+                "buttonLabel": "Add Lab Orders",
+                "workspaceName": "add-lab-order"
               }
             },
             {
@@ -9216,12 +9170,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "referralsOrdered === '488b58ff-64f5-4f8a-8979-fa79940b1594'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "referralsOrdered !== 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3'"
+              },
               "id": "refferedFor"
             },
             {
@@ -9232,14 +9186,9 @@
                 "concept": "164359AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rows": ""
               },
-              "behaviours": [
-                {
-                  "intent": "*",
-                  "hide": {
-                    "hideWhenExpression": "referralsOrdered === '488b58ff-64f5-4f8a-8979-fa79940b1594'"
-                  }
-                }
-              ],
+              "hide": {
+                "hideWhenExpression": "referralsOrdered === '488b58ff-64f5-4f8a-8979-fa79940b1594'"
+              },
               "id": "referralNotes"
             }
           ]
diff --git a/distro/configuration/ampathforms/DRC HIV Enrolment Form v1.2.json b/distro/configuration/ampathforms/DRC HIV Enrolment Form v1.2.json
index 19c951571..ca4f4ab02 100644
--- a/distro/configuration/ampathforms/DRC HIV Enrolment Form v1.2.json	
+++ b/distro/configuration/ampathforms/DRC HIV Enrolment Form v1.2.json	
@@ -75,17 +75,24 @@
             {
               "label": "Unique ID",
               "type": "obs",
+              "required": true,
+              "id": "patientIdentifier",
               "questionOptions": {
                 "rendering": "text",
-                "concept": "162576AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-              },
-              "validators": [
-                {
-                  "type": "js_expression",
-                  "failsWhenExpression": "isEmpty(patientIdentifier)"
-                }
-              ],
-              "id": "patientIdentifier"
+                "concept": "162576AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "conceptMappings": [
+                  {
+                    "relationship": "NARROWER-THAN",
+                    "type": "SNOMED-CT",
+                    "value": "422549004"
+                  },
+                  {
+                    "relationship": "SAME-AS",
+                    "type": "CIEL",
+                    "value": "162576"
+                  }
+                ]
+              }
             },
             {
               "label": "Entry Point",
@@ -370,13 +377,13 @@
                 ]
               },
               "id": "otherEntryPoint",
+              "hide": {
+                "hideWhenExpression": "enrollmentMethod !== '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "!includes('enrollmentMethod','5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
-                  }
+                  "unspecified": "true"
                 }
               ]
             }
@@ -444,8 +451,7 @@
                     "label": "Secondary school education"
                   }
                 ]
-              },
-              "validators": []
+              }
             },
             {
               "label": "Marital Status",
@@ -621,12 +627,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "clientPopulationCategory !== '166431AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "clientPopulationCategory !== '166431AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "keyPopulationType"
             },
             {
@@ -679,12 +685,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "clientPopulationCategory !== '167143AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "clientPopulationCategory !== '167143AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "priorityPopulationType"
             }
           ]
@@ -913,7 +919,7 @@
                   "unspecified": "true"
                 }
               ],
-              "id": "patientIdentifier"
+              "id": "currentArtRegiment"
             },
             {
               "label": "Transfer Documents",
@@ -972,7 +978,10 @@
             "hideWhenExpression": "isEmpty(clientDescription) || clientDescription !== '160563AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
           }
         }
-      ]
+      ],
+      "hide": {
+        "hideWhenExpression": "isEmpty(clientDescription) || clientDescription !== '160563AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+      }
     },
     {
       "label": "HIV Diagnosis",
@@ -1083,7 +1092,10 @@
             "hideWhenExpression": "isEmpty(clientDescription) || clientDescription === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
           }
         }
-      ]
+      ],
+      "hide": {
+        "hideWhenExpression": "isEmpty(clientDescription) || clientDescription === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+      }
     },
     {
       "label": "Previous ARV/HAART Use",
@@ -1169,6 +1181,7 @@
             {
               "label": "Date Last Used",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "date",
                 "concept": "5af829e9-2427-4ed7-bb55-de4381610364"
@@ -1176,21 +1189,20 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "isEmpty(previousUseOfPrep) || previousUseOfPrep !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  },
-                  "validators": [
-                    {
-                      "type": "date",
-                      "allowFutureDates": "false"
-                    },
-                    {
-                      "type": "js_expression",
-                      "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
-                    }
-                  ]
+                  "unspecified": "true"
+                }
+              ],
+              "hide": {
+                "hideWhenExpression": "isEmpty(previousUseOfPrep) || previousUseOfPrep !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
+              "validators": [
+                {
+                  "type": "date",
+                  "allowFutureDates": "false"
+                },
+                {
+                  "type": "js_expression",
+                  "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
                 }
               ],
               "id": "datePrepLastUsed"
@@ -1259,6 +1271,7 @@
             {
               "label": "Date Last Used",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "date",
                 "concept": "fbe937b6-a4ad-4ce5-9c43-002222fbabfb"
@@ -1266,22 +1279,22 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "isEmpty(previousUseOfPep) || previousUseOfPep !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  },
-                  "validators": [
-                    {
-                      "type": "date",
-                      "allowFutureDates": "false"
-                    },
-                    {
-                      "type": "js_expression",
-                      "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
-                    }
-                  ]
+                  "unspecified": "true"
+                }
+              ],
+              "validators": [
+                {
+                  "type": "date",
+                  "allowFutureDates": "false"
+                },
+                {
+                  "type": "js_expression",
+                  "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "isEmpty(previousUseOfPep) || previousUseOfPep !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "datePepLastUsed"
             },
             {
@@ -1348,6 +1361,7 @@
             {
               "label": "Date Last Used",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "date",
                 "concept": "6a6cbda5-b155-4144-9ff9-ec3d1d1cd509"
@@ -1355,22 +1369,22 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "isEmpty(useOfArvsForHepatitis) || useOfArvsForHepatitis !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  },
-                  "validators": [
-                    {
-                      "type": "date",
-                      "allowFutureDates": "false"
-                    },
-                    {
-                      "type": "js_expression",
-                      "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
-                    }
-                  ]
+                  "unspecified": "true"
                 }
               ],
+              "validators": [
+                {
+                  "type": "date",
+                  "allowFutureDates": "false"
+                },
+                {
+                  "type": "js_expression",
+                  "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
+                }
+              ],
+              "hide": {
+                "hideWhenExpression": "isEmpty(useOfArvsForHepatitis) || useOfArvsForHepatitis !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "dateHepBLastUsed"
             },
             {
@@ -1437,6 +1451,7 @@
             {
               "label": "Date Last Used",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "date",
                 "concept": "163782AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
@@ -1444,22 +1459,22 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "isEmpty(useOfArvsForPMTCT) || useOfArvsForPMTCT !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  },
-                  "validators": [
-                    {
-                      "type": "date",
-                      "allowFutureDates": "false"
-                    },
-                    {
-                      "type": "js_expression",
-                      "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
-                    }
-                  ]
+                  "unspecified": "true"
+                }
+              ],
+              "validators": [
+                {
+                  "type": "date",
+                  "allowFutureDates": "false"
+                },
+                {
+                  "type": "js_expression",
+                  "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "isEmpty(useOfArvsForPMTCT) || useOfArvsForPMTCT !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "datePmtctLastUsed"
             }
           ]
@@ -1690,10 +1705,13 @@
             {
               "intent": "*",
               "hide": {
-                "hideWhenExpression": "isEmpty(useOfArvsForHepatitis) || isEmpty(previousUseOfPep) || isEmpty(previousUseOfPrep) || useOfArvsForHepatitis !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || previousUseOfPep !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || previousUseOfPrep !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "isEmpty(useOfArvsForHepatitis) || isEmpty(previousUseOfPep) || isEmpty(previousUseOfPrep) || isEmpty(useOfArvsForPMTCT) || useOfArvsForHepatitis !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || previousUseOfPep !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || previousUseOfPrep !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || useOfArvsForPMTCT !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             }
-          ]
+          ],
+          "hide": {
+            "hideWhenExpression": "isEmpty(useOfArvsForHepatitis) || isEmpty(previousUseOfPep) || isEmpty(previousUseOfPrep) || isEmpty(useOfArvsForPMTCT) || useOfArvsForHepatitis !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || previousUseOfPep !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || previousUseOfPrep !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || useOfArvsForPMTCT !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+          }
         }
       ],
       "behaviours": [
@@ -1703,7 +1721,10 @@
             "hideWhenExpression": "isEmpty(clientDescription) || clientDescription === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
           }
         }
-      ]
+      ],
+      "hide": {
+        "hideWhenExpression": "isEmpty(clientDescription) || clientDescription === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+      }
     },
     {
       "label": "Treatment Supporter",
@@ -1759,6 +1780,7 @@
             {
               "label": "Treatment Supporter Name",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "text",
                 "concept": "160638AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
@@ -1766,17 +1788,18 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "isEmpty(hasTreatmentSupporter) || hasTreatmentSupporter !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "isEmpty(hasTreatmentSupporter) || hasTreatmentSupporter !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "treatmentSupporter"
             },
             {
               "label": "Treatment Supporter Phone Number",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "text",
                 "concept": "160642AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
@@ -1784,14 +1807,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "isEmpty(hasTreatmentSupporter) || hasTreatmentSupporter !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  },
-                  "validators": []
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "isEmpty(hasTreatmentSupporter) || hasTreatmentSupporter !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "treatmentSupporterPhoneNumber"
             },
             {
@@ -1910,25 +1931,20 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "isEmpty(hasTreatmentSupporter) || hasTreatmentSupporter !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                  }
+                  "unspecified": "true"
                 }
               ],
+              "hide": {
+                "hideWhenExpression": "isEmpty(hasTreatmentSupporter) || hasTreatmentSupporter !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "id": "relationToTreatmentSupporter"
             }
           ]
         }
       ],
-      "behaviours": [
-        {
-          "intent": "*",
-          "hide": {
-            "hideWhenExpression": "isEmpty(clientDescription) || clientDescription === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-          }
-        }
-      ]
+      "hide": {
+        "hideWhenExpression": "isEmpty(clientDescription) || clientDescription === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+      }
     },
     {
       "label": "Re-enrolment",
@@ -1978,7 +1994,10 @@
             "hideWhenExpression": "isEmpty(clientDescription) || clientDescription !== '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
           }
         }
-      ]
+      ],
+      "hide": {
+        "hideWhenExpression": "isEmpty(clientDescription) || clientDescription !== '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+      }
     },
     {
       "label": "Notes",
diff --git a/distro/configuration/ampathforms/ct_death_v1.0.json b/distro/configuration/ampathforms/ct_death_v1.0.json
index b57c1938f..4370e81a6 100644
--- a/distro/configuration/ampathforms/ct_death_v1.0.json
+++ b/distro/configuration/ampathforms/ct_death_v1.0.json
@@ -31,6 +31,7 @@
             {
               "label": "Date of death",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "date",
                 "concept": "1543AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -54,27 +55,24 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "false",
-                  "hide": {
-                    "hideWhenExpression": "false"
-                  },
-                  "validators": [
-                    {
-                      "type": "date",
-                      "allowFutureDates": "false"
-                    },
-                    {
-                      "type": "js_expression",
-                      "failsWhenExpression": "myValue > today() || myValue < useFieldValue('dateOfFirstVisit') || myValue <= '159599AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-                    }
-                  ]
+                  "unspecified": "false"
+                }
+              ],
+              "validators": [
+                {
+                  "type": "date",
+                  "allowFutureDates": "false"
+                },
+                {
+                  "type": "js_expression",
+                  "failsWhenExpression": "myValue > today() || myValue < useFieldValue('dateOfFirstVisit') || myValue <= '159599AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
                 }
               ]
             },
             {
               "label": "Cause of Death",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "radio",
                 "concept": "1599AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -327,24 +325,14 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "false",
-                  "hide": {
-                    "hideWhenExpression": "false"
-                  },
-                  "validators": []
+                  "unspecified": "false"
                 }
               ]
-            }
-          ]
-        },
-        {
-          "label": "Specific Cause of Death",
-          "isExpanded": "true",
-          "questions": [
+            },
             {
               "label": "HIV disease resulting in other malignant neoplasms",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "select",
                 "concept": "efd206db-ed68-4ac3-8916-da524f029643",
@@ -493,18 +481,17 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "isEmpty(Deathreason) || Deathreason !=='159988AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
-                  },
-                  "validators": []
+                  "unspecified": "true"
                 }
-              ]
+              ],
+              "hide": {
+                "hideWhenExpression": "isEmpty(Deathreason) || Deathreason !=='159988AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
+              }
             },
             {
               "label": "HIV disease resulting in infectious & parasitic diseases",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "select",
                 "concept": "1c06de20-fbc0-4d42-a638-f273e5db2146",
@@ -681,18 +668,17 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "isEmpty(Deathreason) || Deathreason !=='160159AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
-                  },
-                  "validators": []
+                  "unspecified": "true"
                 }
-              ]
+              ],
+              "hide": {
+                "hideWhenExpression": "Deathreason !=='160159AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
+              }
             },
             {
               "label": "Other diseases or conditions leading to death",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "select",
                 "concept": "162574AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -734,14 +720,12 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "isEmpty(Deathreason) || Deathreason !=='160160AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
-                  },
-                  "validators": []
+                  "unspecified": "true"
                 }
-              ]
+              ],
+              "hide": {
+                "hideWhenExpression": "Deathreason !=='160160AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
+              }
             }
           ]
         },
diff --git a/distro/configuration/ampathforms/ct_service_delivery_v1.0.json b/distro/configuration/ampathforms/ct_service_delivery_v1.0.json
index 9da7bcf4f..fad4dd1b1 100644
--- a/distro/configuration/ampathforms/ct_service_delivery_v1.0.json
+++ b/distro/configuration/ampathforms/ct_service_delivery_v1.0.json
@@ -30,86 +30,85 @@
             {
               "label": "Date enrolled to DSD",
               "type": "obs",
+              "required": true,
+              "id": "dateEnrolledToDSD",
+              "datePickerFormat": "calendar",
               "questionOptions": {
                 "rendering": "date",
                 "concept": "160753AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "weeksList": "",
                 "conceptMappings": [
                   {
-                    "type": "SNOMED-CT",
-                    "value": "439771001"
-                  },
-                  {
+                    "relationship": "SAME-AS",
                     "type": "CIEL",
                     "value": "160753"
+                  },
+                  {
+                    "relationship": "SAME-AS",
+                    "type": "SNOMED-CT",
+                    "value": "439771001"
                   }
                 ]
               },
-              "id": "dateEnrolledToDSD",
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "!includes('dsdService','9cca15ce-db78-4a39-be0d-aae19e089ec1')"
-                  },
-                  "validators": [
-                    {
-                      "type": "date",
-                      "allowFutureDates": "false"
-                    },
-                    {
-                      "type": "js_expression",
-                      "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
-                    }
-                  ]
+                  "unspecified": "true"
+                }
+              ],
+              "validators": [
+                {
+                  "type": "date",
+                  "allowFutureDates": "false"
+                },
+                {
+                  "type": "js_expression",
+                  "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
                 }
               ]
             },
             {
               "label": "Date disenrolled from DSD",
               "type": "obs",
+              "required": true,
+              "id": "dateDisenrolledDSD",
+              "datePickerFormat": "calendar",
               "questionOptions": {
                 "rendering": "date",
                 "concept": "160753AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "weeksList": "",
                 "conceptMappings": [
                   {
-                    "type": "SNOMED-CT",
-                    "value": "439771001"
-                  },
-                  {
+                    "relationship": "SAME-AS",
                     "type": "CIEL",
                     "value": "160753"
+                  },
+                  {
+                    "relationship": "SAME-AS",
+                    "type": "SNOMED-CT",
+                    "value": "439771001"
                   }
                 ]
               },
-              "id": "dateDisenrolledDSD",
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "!includes('dsdService','b5ddaf2e-dae3-4e4d-81ca-6cead3d59973')"
-                  },
-                  "validators": [
-                    {
-                      "type": "date",
-                      "allowFutureDates": "false"
-                    },
-                    {
-                      "type": "js_expression",
-                      "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
-                    }
-                  ]
+                  "unspecified": "true"
+                }
+              ],
+              "validators": [
+                {
+                  "type": "date",
+                  "allowFutureDates": "false"
+                },
+                {
+                  "type": "js_expression",
+                  "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
                 }
               ]
             },
             {
               "label": "Reason for disenrolling from DSD",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "text",
                 "concept": "163513AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
@@ -118,11 +117,7 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
                   "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "!includes('dsdService','b5ddaf2e-dae3-4e4d-81ca-6cead3d59973')"
-                  },
                   "validators": []
                 }
               ]
@@ -186,12 +181,7 @@
           "behaviours": [
             {
               "intent": "*",
-              "required": "true",
-              "unspecified": "true",
-              "hide": {
-                "hideWhenExpression": "!includes('dsdService','9cca15ce-db78-4a39-be0d-aae19e089ec1')"
-              },
-              "validators": []
+              "unspecified": "true"
             }
           ]
         },
diff --git a/distro/configuration/ampathforms/ct_transfer_out_v1.0.json b/distro/configuration/ampathforms/ct_transfer_out_v1.0.json
index c7a0080ab..4f260e8dd 100644
--- a/distro/configuration/ampathforms/ct_transfer_out_v1.0.json
+++ b/distro/configuration/ampathforms/ct_transfer_out_v1.0.json
@@ -28,6 +28,7 @@
             {
               "label": "Receiving Facility",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "text",
                 "concept": "162724AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
@@ -36,18 +37,14 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "false"
-                  },
-                  "validators": []
+                  "unspecified": "true"
                 }
               ]
             },
             {
               "label": "Transfer-Out Date (Date transfer-out takes effect)",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "date",
                 "concept": "160649AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -63,21 +60,17 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "false"
-                  },
-                  "validators": [
-                    {
-                      "type": "date",
-                      "allowFutureDates": "true"
-                    },
-                    {
-                      "type": "js_expression",
-                      "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue < useFieldValue('dateOfFirstVisit')"
-                    }
-                  ]
+                  "unspecified": "true"
+                }
+              ],
+              "validators": [
+                {
+                  "type": "date",
+                  "allowFutureDates": "true"
+                },
+                {
+                  "type": "js_expression",
+                  "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue < useFieldValue('dateOfFirstVisit')"
                 }
               ]
             }
@@ -91,6 +84,7 @@
             {
               "label": "Transfer-out Verified",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "radio",
                 "concept": "797e0073-1f3f-46b1-8b1a-8cdad134d2b3",
@@ -175,18 +169,14 @@
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "false"
-                  },
-                  "validators": []
+                  "unspecified": "true"
                 }
               ]
             },
             {
               "label": "Date verification done",
               "type": "obs",
+              "required": true,
               "questionOptions": {
                 "rendering": "date",
                 "concept": "160753AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
@@ -211,24 +201,23 @@
                 ]
               },
               "id": "verificationDate",
+              "hide": {
+                "hideWhenExpression": "isTransferOutVerified !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+              },
               "behaviours": [
                 {
                   "intent": "*",
-                  "required": "true",
-                  "unspecified": "true",
-                  "hide": {
-                    "hideWhenExpression": "!includes('isTransferOutVerified','1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
-                  },
-                  "validators": [
-                    {
-                      "type": "date",
-                      "allowFutureDates": "false"
-                    },
-                    {
-                      "type": "js_expression",
-                      "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
-                    }
-                  ]
+                  "unspecified": "true"
+                }
+              ],
+              "validators": [
+                {
+                  "type": "date",
+                  "allowFutureDates": "false"
+                },
+                {
+                  "type": "js_expression",
+                  "failsWhenExpression": "isDateBefore(myValue, '1980-01-01') || myValue >= today()"
                 }
               ]
             }
diff --git a/distro/configuration/globalproperties/globalproperties-core_demo.xml b/distro/configuration/globalproperties/globalproperties-core_demo.xml
index 6ef8f9608..a09a2eaba 100644
--- a/distro/configuration/globalproperties/globalproperties-core_demo.xml
+++ b/distro/configuration/globalproperties/globalproperties-core_demo.xml
@@ -39,6 +39,6 @@
 
     <globalProperty>
         <property>attachments.allowedFileExtensions</property>
-        <value>jpeg,jpg,png,webp</value>
+        <value>jpeg,jpg,png</value>
     </globalProperty>
 </config>
diff --git a/distro/pom.xml b/distro/pom.xml
index f7d1e2627..3723d1bfd 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -23,23 +23,23 @@
 
     <!-- track module versions
          we do so here so that we can utilise Maven to track updates, etc. -->
-    <fhir2.version>2.3.0-SNAPSHOT</fhir2.version>
+    <fhir2.version>2.2.0</fhir2.version>
     <authentication.version>1.0.0</authentication.version>
-    <openmrs.version>2.6.9</openmrs.version>
-    <initializer.version>2.8.0-SNAPSHOT</initializer.version>
+    <openmrs.version>2.6.7</openmrs.version>
+    <initializer.version>2.7.0</initializer.version>
     <webservices.rest.version>2.45.0-SNAPSHOT</webservices.rest.version>
-    <addresshierarchy.version>2.19.0</addresshierarchy.version>
-    <idgen.version>4.12.0</idgen.version>
-    <legacyui.version>1.18.0</legacyui.version>
+    <addresshierarchy.version>2.17.0</addresshierarchy.version>
+    <idgen.version>4.10.0</idgen.version>
+    <legacyui.version>1.16.0</legacyui.version>
     <metadatamapping.version>1.6.0</metadatamapping.version>
     <metadatasharing.version>1.9.0</metadatasharing.version>
-    <openconceptlab.version>2.4.0</openconceptlab.version>
-    <attachments.version>3.4.0</attachments.version>
+    <openconceptlab.version>2.3.0</openconceptlab.version>
+    <attachments.version>3.2.0</attachments.version>
     <referencedemodata.version>2.4.0</referencedemodata.version>
     <queue.version>2.4.0</queue.version>
     <appointments.version>2.0.0-20240305.062514-14</appointments.version>
     <teleconsultation.version>2.0.0-20230831.113926-1</teleconsultation.version>
-    <cohort.version>3.7.2</cohort.version>
+    <cohort.version>3.7.1</cohort.version>
     <reporting.version>1.26.0</reporting.version>
     <reportingrest.version>1.14.0</reportingrest.version>
     <!-- the next three are required for reporting -->
@@ -47,7 +47,7 @@
     <htmlwidgets.version>1.11.0</htmlwidgets.version>
     <serialization-xstream.version>0.2.16</serialization-xstream.version>
     <ordertemplates.version>1.0.2</ordertemplates.version>
-    <patientflags.version>3.0.8</patientflags.version>
+    <patientflags.version>3.0.7</patientflags.version>
     <o3forms.version>2.3.0</o3forms.version>
     <!-- Stock Management and Billing -->
     <stockmanagement.version>2.0.2-SNAPSHOT</stockmanagement.version>
diff --git a/pom.xml b/pom.xml
index 9bd29d4e8..bda63aa38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,12 +109,12 @@
         <plugin>
           <groupId>org.openmrs.maven.plugins</groupId>
           <artifactId>openmrs-sdk-maven-plugin</artifactId>
-          <version>5.15.0</version>
+          <version>4.5.0</version>
         </plugin>
         <plugin>
           <groupId>org.openmrs.maven.plugins</groupId>
           <artifactId>openmrs-packager-maven-plugin</artifactId>
-          <version>1.9.0-SNAPSHOT</version>
+          <version>1.7.0</version>
         </plugin>
       </plugins>
     </pluginManagement>