diff --git a/configuration/ampathforms/HIV_Discontinuation.json b/configuration/ampathforms/HIV_Discontinuation.json
index a1852ee6..5619402c 100644
--- a/configuration/ampathforms/HIV_Discontinuation.json
+++ b/configuration/ampathforms/HIV_Discontinuation.json
@@ -317,7 +317,7 @@
               "id": "transferToFacility",
               "questionOptions": {
                 "concept": "159495AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "rendering": "text"
+                "rendering": "encounterLocation"
               },
               "hide": {
                 "hideWhenExpression": "isEmpty(idReason) || idReason !== '159492AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
diff --git a/configuration/ampathforms/HIV_Enrollment.json b/configuration/ampathforms/HIV_Enrollment.json
index 7e82adaf..9b63badd 100644
--- a/configuration/ampathforms/HIV_Enrollment.json
+++ b/configuration/ampathforms/HIV_Enrollment.json
@@ -177,7 +177,7 @@
               "id": "facilityFrom",
               "questionOptions": {
                 "concept": "161550AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "rendering": "text"
+                "rendering": "encounterLocation"
               },
               "hide": {
                 "hideWhenExpression": "isEmpty(patientType) || patientType !== '4bd29eed-e486-426d-a2b6-7e5bb75319f6'"
@@ -207,7 +207,7 @@
               "id": "transferredFrom",
               "questionOptions": {
                 "concept": "160535AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "rendering": "text"
+                "rendering": "encounterLocation"
               },
               "hide": {
                 "hideWhenExpression": "isEmpty(patientType) || patientType !== '160563AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
@@ -1154,7 +1154,6 @@
                 "concept": "6032AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "radio",
                 "answers": [
-                  
                   {
                     "concept": "111759AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "label": "Yes"
@@ -1177,7 +1176,6 @@
                 "concept": "164500AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "radio",
                 "answers": [
-                  
                   {
                     "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "label": "Yes"
@@ -1200,7 +1198,6 @@
                 "concept": "5272AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "radio",
                 "answers": [
-                  
                   {
                     "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "label": "Yes"
@@ -1223,7 +1220,6 @@
                 "concept": "5632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "rendering": "radio",
                 "answers": [
-                  
                   {
                     "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "label": "Yes"