diff --git a/distro/configuration/ampathforms/DRC Clinical Visit Form v2.2.json b/distro/configuration/ampathforms/DRC Clinical Visit Form v2.2.json
index 67b9e13c5..7cc973808 100644
--- a/distro/configuration/ampathforms/DRC Clinical Visit Form v2.2.json	
+++ b/distro/configuration/ampathforms/DRC Clinical Visit Form v2.2.json	
@@ -3180,7 +3180,7 @@
                     ]
                   },
                   {
-                    "concept": "b52ffe16-b482-4f61-9bb9-9787320beef5",
+                    "concept": "1858AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "label": "Weight Loss (Abnormal weight loss)",
                     "conceptMappings": []
                   },
@@ -3754,7 +3754,7 @@
                     "conceptMappings": []
                   },
                   {
-                    "concept": "bbdf46fb-f941-4075-a2ae-985163accce1",
+                    "concept": "1fd4b164-1374-4bd5-aadb-94d1d071a282",
                     "label": "3HR Isoniazid+Rifampicin prophylaxis",
                     "conceptMappings": []
                   },
@@ -6007,10 +6007,10 @@
               "type": "obs",
               "questionOptions": {
                 "rendering": "radio",
-                "concept": "c4f81292-61a3-4561-a4ae-78be7d16d928",
+                "concept": "166664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "answers": [
                   {
-                    "concept": "118990AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                    "concept": "864AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "label": "Genital Sore",
                     "conceptMappings": [
                       {
@@ -6112,7 +6112,7 @@
                     ]
                   },
                   {
-                    "concept": "c795654c-bcd8-4074-9fc7-e5f762e58f36",
+                    "concept": "123529AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "label": "Urethral Discharge",
                     "conceptMappings": []
                   },
@@ -9295,5 +9295,5 @@
   "encounterType": "cb0a65a7-0587-477e-89b9-cf2fd144f1d4",
   "encounter": "Clinical Visit",
   "allowUnspecifiedAll": true,
-  "description": "DRC POC Clinical Visit Form v2 revised - embedded forms removed"
+  "description": "DRC POC Clinical Visit Form v2 revised - embedded forms removed "
 }
diff --git a/distro/configuration/ampathforms/ct_patient_tracing_v1.0.json b/distro/configuration/ampathforms/ct_patient_tracing_v1.0.json
index f70aadead..c86e53bcf 100644
--- a/distro/configuration/ampathforms/ct_patient_tracing_v1.0.json
+++ b/distro/configuration/ampathforms/ct_patient_tracing_v1.0.json
@@ -456,7 +456,7 @@
                   "required": "true",
                   "unspecified": "true",
                   "hide": {
-                    "hideWhenExpression": "!includes('patientContacted','1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
+                    "hideWhenExpression": "patientContacted !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
                   },
                   "validators": []
                 }
@@ -519,7 +519,7 @@
                   "required": "true",
                   "unspecified": "true",
                   "hide": {
-                    "hideWhenExpression": "!includes('patientContacted','1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
+                    "hideWhenExpression": "patientContacted !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
                   },
                   "validators": []
                 }
@@ -675,7 +675,7 @@
                   "required": "true",
                   "unspecified": "true",
                   "hide": {
-                    "hideWhenExpression": "!includes('finalOutcomeReached','1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')"
+                    "hideWhenExpression": "finalOutcomeReached !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
                   },
                   "validators": []
                 }
@@ -720,7 +720,7 @@
     }
   ],
   "processor": "EncounterFormProcessor",
-  "uuid": "71f3febd-dd11-322b-9c18-2a8a07d87af1",
+  "uuid": "b300f1e0-1424-4d37-aa09-53531db248f2",
   "referencedForms": [],
   "encounterType": "0cd5d4cb-204e-419a-9dd7-1e18e939ce4c",
   "encounter": "Patient Tracing Form",
diff --git a/distro/configuration/conceptsources/conceptsources-core_data.csv b/distro/configuration/conceptsources/conceptsources-core_data.csv
index 3325f073c..3d937354d 100644
--- a/distro/configuration/conceptsources/conceptsources-core_data.csv
+++ b/distro/configuration/conceptsources/conceptsources-core_data.csv
@@ -24,7 +24,6 @@ ddb6b595-0b85-4a80-9243-efe4ba404eef,,org.openmrs.module.mdrtb,The required conc
 1b880698-489f-59ed-bd5b-f42a2f5c8e81,,HL7-MedicationDispenseStatus,Medication dispense status for FHIR,,
 50ef5518-f4e3-4c49-9352-0002202005e9,,ANCDAK,WHO SMART Guideline Data Elements,,
 37ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD,,KenyaEMR,Kenya National Electronic Medical Record Concept Dictionary,,
-2b3c054a-768a-102f-83f4-12313b04a615,true,SNOMED-CT,Systematized Nomenclature of Medicine--Clinical Terms,,
 2b3c2a2a-768a-102f-83f4-12313b04a615,,SNOMED-MVP,MVP Namespace Identifier extensions to SNOMED CT,,
 cf7414cf-4423-4110-85b9-eae8689691de,,IMO-ProblemIT,"Intelligent Medical Objects, Inc. problem/disease/finding datasource",,
 3f65bd34-26fe-102b-80cb-0017a47871b2,,ICD-10-WHO,"International Classification for Diseases version 10, WHO",,