diff --git a/configuration/ampathforms/HTS_Linkage.json b/configuration/ampathforms/HTS_Linkage.json
index 37c5dd16..c0bfdec2 100644
--- a/configuration/ampathforms/HTS_Linkage.json
+++ b/configuration/ampathforms/HTS_Linkage.json
@@ -87,7 +87,10 @@
 							"id": "thisfacility",
 							"questionOptions": {
 								"concept": "162724AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "text"
+								"rendering": "text",
+								"calculate": {
+									"calculateExpression": "userLocation.display"
+								  }
 							
 							},
 							"hide": {
@@ -197,7 +200,12 @@
 								{
 									"type": "date",
 									"allowFutureDates": "false"
-								}
+								},
+								{
+									"type": "js_expression",
+									"failsWhenExpression": "(new moment(dateenrolled)).isAfter((new moment(myValue)), 'day')",
+									"message": "ART start date should be greater than or equal to the enrolment date."
+								  }
 							],
 							"id": "artstartdate"
 						},