diff --git a/configuration/ampathforms/MCH-MS_Discontinuation.json b/configuration/ampathforms/MCH-MS_Discontinuation.json
index 20cdbf70..6b0433d4 100644
--- a/configuration/ampathforms/MCH-MS_Discontinuation.json
+++ b/configuration/ampathforms/MCH-MS_Discontinuation.json
@@ -10,7 +10,7 @@
 		"programs": {
 			"uuid": "b5d9e05f-f5ab-4612-98dd-adb75438ed34",
 			"isEnrollment": false,
-			"discontinuationDateQuestionId": "encounterDatetime"
+			"discontinuationDateQuestionId": "getencounterDatetime"
 		}
   },
 	"pages": [
@@ -101,19 +101,12 @@
 							}
 						},
 						{
-							"label": "(if transferred out)Transfer to Facility:",
-							"type": "obs",
+							"label": "Transfer to Facility(if transferred out):",
+							"type": "encounterLocation",
 							"id": "transferFacility",
 							"questionOptions": {
-								"concept": "159495AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "text"
+								"rendering": "ui-select-extended"
 							},
-							"validators": [
-								{
-									"type": "date",
-									"allowFutureDates": "false"
-								}
-							],
 							"hide": {
 								"hideWhenExpression": "DiscontinuationReason !== '159492AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
 							}