diff --git a/configuration/ampathforms/HIV_Enrollment.json b/configuration/ampathforms/HIV_Enrollment.json
index e1a4af8d..302f327e 100644
--- a/configuration/ampathforms/HIV_Enrollment.json
+++ b/configuration/ampathforms/HIV_Enrollment.json
@@ -1312,7 +1312,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "isEmpty(patientType) || age > 18 && patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "isEmpty(patientType) || age > 18 || patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1324,17 +1324,17 @@
                 "rendering": "select",
                 "answers": [
                   {
-                    "concept": "yes",
+                    "concept": "true",
                     "label": "Yes"
                   },
                   {
-                    "concept": "no",
+                    "concept": "false",
                     "label": "No"
                   }
                 ]
               },
               "hide": {
-                "hideWhenExpression": "isEmpty(patientType) || age > 18 && patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "isEmpty(patientType) || age > 18 || patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1382,10 +1382,7 @@
                   }
                 }
               ],
-              "id": "guardianSuppORT",
-              "hide": {
-                "hideWhenExpression": "isEmpty(patientType) || age > 18 || patientType === '4bd29eed-e486-426d-a2b6-7e5bb75319f6' || patientType === '159833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-              }
+              "id": "guardianSuppORT"
             }
           ]
         },
@@ -1480,4 +1477,4 @@
     }
   ],
   "encounterType": "de78a6be-bfc5-4634-adc3-5f1a280455cc"
-}
+}
\ No newline at end of file