diff --git a/configuration/ampathforms/HIV_Enrollment.json b/configuration/ampathforms/HIV_Enrollment.json
index 5b684efd..e1a4af8d 100644
--- a/configuration/ampathforms/HIV_Enrollment.json
+++ b/configuration/ampathforms/HIV_Enrollment.json
@@ -582,10 +582,6 @@
                         "concept": "162562AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                         "label": "ABC/LPV/R/TDF"
                       },
-                      {
-                        "concept": "161361AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                        "label": "EDF/3TC/EFV"
-                      },
                       {
                         "concept": "792AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                         "label": "D4T/3TC/NVP"
@@ -1166,7 +1162,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientType === '164144AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1188,7 +1184,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientType === '164144AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1210,7 +1206,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientType === '164144AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
+                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
               }
             },
             {
@@ -1232,7 +1228,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientType === '164144AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
+                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
               }
             },
             {
@@ -1246,7 +1242,7 @@
                 "min": "0"
               },
               "hide": {
-                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientType === '164144AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1260,7 +1256,7 @@
                 "min": "0"
               },
               "hide": {
-                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientType === '164144AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1275,7 +1271,7 @@
                 }
               },
               "hide": {
-                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientType === '164144AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1288,7 +1284,7 @@
                 "min": "0"
               },
               "hide": {
-                "hideWhenExpression": "pregnant !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientType === '164144AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "pregnant !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             }
           ]
@@ -1316,7 +1312,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age > 17"
+                "hideWhenExpression": "isEmpty(patientType) || age > 18 && patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1338,7 +1334,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age > 17"
+                "hideWhenExpression": "isEmpty(patientType) || age > 18 && patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1356,6 +1352,9 @@
                   "questionOptions": {
                     "concept": "160638AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "rendering": "text"
+                  },
+                  "hide": {
+                    "hideWhenExpression": "isEmpty(patientType) || age > 18 || patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
                   }
                 },
                 {
@@ -1365,6 +1364,9 @@
                   "questionOptions": {
                     "concept": "160642AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "rendering": "text"
+                  },
+                  "hide": {
+                    "hideWhenExpression": "isEmpty(patientType) || age > 18 || patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
                   }
                 },
                 {
@@ -1374,12 +1376,15 @@
                   "questionOptions": {
                     "concept": "160641AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "rendering": "text"
+                  },
+                  "hide": {
+                    "hideWhenExpression": "isEmpty(patientType) || age > 18 || patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
                   }
                 }
               ],
               "id": "guardianSuppORT",
               "hide": {
-                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age > 17"
+                "hideWhenExpression": "isEmpty(patientType) || age > 18 || patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             }
           ]
@@ -1466,12 +1471,13 @@
               ],
               "id": "treaTMeNTsupp",
               "hide": {
-                "hideWhenExpression": "patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "isEmpty(patientType) || patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             }
           ]
         }
       ]
     }
-  ]
+  ],
+  "encounterType": "de78a6be-bfc5-4634-adc3-5f1a280455cc"
 }