diff --git a/distro/configuration/locations/locations-core_demo.csv b/distro/configuration/locations/locations-core_demo.csv
index 33ea00794..fa750ab99 100644
--- a/distro/configuration/locations/locations-core_demo.csv
+++ b/distro/configuration/locations/locations-core_demo.csv
@@ -3,58 +3,58 @@ Uuid,Void/Retire,Name,Description,Parent,Tag|Login Location,Tag|Visit Location,T
 f47ac10b-58cc-4372-a567-0e02b2c3d479,,Ubuntu Hospital,Ubuntu Hospital,,,TRUE,,,,,,,,,,,,,,,,,,
 44c3efb0-2583-4c80-a79e-1f756a03c0a1,,Outpatient Clinic,Outpatient Clinic,Ubuntu Hospital,TRUE,,TRUE,TRUE,,,,,,,,,,,,,,,,
 ba685651-ed3b-4e63-9b35-78893060758a,,Inpatient Ward,Inpatient Ward,Ubuntu Hospital,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
-8d9045ad-50f0-45b8-93c8-3ed4bce19dbf,,Mobile Clinic,Mobile Clinic,,TRUE,,,,,,,,,,,,,,,,,,,
-1ce1b7d4-c865-4178-82b0-5932e51503d6,,Community Outreach,Community Outreach,,TRUE,,,,,,,,,,,,,,,,,,,
+8d9045ad-50f0-45b8-93c8-3ed4bce19dbf,,Mobile Clinic,Mobile Clinic,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+1ce1b7d4-c865-4178-82b0-5932e51503d6,,Community Outreach,Community Outreach,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
 184ac7d9-225a-41f8-bac7-c87b1327e1b0,,Ward 1,Ward 1,Ubuntu Hospital,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
 5a7f3c53-6bb4-448b-a966-5e65b397b9f3,,Ward 2,Ward 2,Ubuntu Hospital,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
 2272b8cd-b690-4878-a50c-40d22235b3f3,,Ward 3,Ward 3,Ubuntu Hospital,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
-dbdaabf6-a326-4804-aba7-062073e05cd1,,Site 1,Site 1,,TRUE,,,,,,,,,,,,,,,,,,,
-4a06a96f-dd21-4695-8d76-b9c405cebafc,,Site 2,Site 2,,TRUE,,,,,,,,,,,,,,,,,,,
-d493f3eb-ba7c-4e6c-988d-62491e496045,,Site 3,Site 3,,TRUE,,,,,,,,,,,,,,,,,,,
-dd2ad4cd-e33a-40cc-955a-e91e313f9a3b,,Site 4,Site 4,,TRUE,,,,,,,,,,,,,,,,,,,
-94346397-3848-4b92-9219-a981ed4265f8,,Site 5,Site 5,,TRUE,,,,,,,,,,,,,,,,,,,
-0566e68d-26ff-4e1d-a199-a9b8ecc3a7d4,,Site 6,Site 6,,TRUE,,,,,,,,,,,,,,,,,,,
-9ade8976-a178-4bce-a229-50cfcf61b87d,,Site 7,Site 7,,TRUE,,,,,,,,,,,,,,,,,,,
-50cfb6ca-a360-41f2-b3a0-7c5a19f4aa98,,Site 8,Site 8,,TRUE,,,,,,,,,,,,,,,,,,,
-d5be46a5-3afa-40fa-86ab-3c1ff31543e3,,Site 9,Site 9,,TRUE,,,,,,,,,,,,,,,,,,,
-5f47d469-7c8d-4f34-887c-16db797bec3d,,Site 10,Site 10,,TRUE,,,,,,,,,,,,,,,,,,,
-d81f9408-1582-4270-848f-6af319424733,,Site 11,Site 11,,TRUE,,,,,,,,,,,,,,,,,,,
-ffd78808-5b88-4a56-9c94-54754725ad90,,Site 12,Site 12,,TRUE,,,,,,,,,,,,,,,,,,,
-a61a5145-8da1-4410-be23-479314814cc7,,Site 13,Site 13,,TRUE,,,,,,,,,,,,,,,,,,,
-5e6abb9d-7ab3-4203-8b02-1462bcca0c51,,Site 14,Site 14,,TRUE,,,,,,,,,,,,,,,,,,,
-6536f254-a296-4d0f-84f7-9c0f0b12536e,,Site 15,Site 15,,TRUE,,,,,,,,,,,,,,,,,,,
-0cb740b2-153f-49e2-b599-aabb90330bd2,,Site 16,Site 16,,TRUE,,,,,,,,,,,,,,,,,,,
-2cead8f3-0e6c-468b-9f10-6a7ca75604dd,,Site 17,Site 17,,TRUE,,,,,,,,,,,,,,,,,,,
-facac3e6-8c4a-4528-a497-8cf22ffd1a50,,Site 18,Site 18,,TRUE,,,,,,,,,,,,,,,,,,,
-29fc4038-18d4-4b11-bc2b-63983932e6ac,,Site 19,Site 19,,TRUE,,,,,,,,,,,,,,,,,,,
-c84338a5-69a7-411a-aa0f-f405cb44697b,,Site 20,Site 20,,TRUE,,,,,,,,,,,,,,,,,,,
-09d08c88-5b12-4831-8268-62242822180d,,Site 21,Site 21,,TRUE,,,,,,,,,,,,,,,,,,,
-ac529390-16d6-4454-83be-4fcbbc5988aa,,Site 22,Site 22,,TRUE,,,,,,,,,,,,,,,,,,,
-b03c3107-fc5b-4b49-a31d-02bf327d6dd4,,Site 23,Site 23,,TRUE,,,,,,,,,,,,,,,,,,,
-302090a6-11ac-455d-80c9-08c06ebd1087,,Site 24,Site 24,,TRUE,,,,,,,,,,,,,,,,,,,
-bb5787d4-307e-40ec-89b3-f9f539a5d88f,,Site 25,Site 25,,TRUE,,,,,,,,,,,,,,,,,,,
-13ecc2c0-7170-4d51-a93d-7189fd885c05,,Site 26,Site 26,,TRUE,,,,,,,,,,,,,,,,,,,
-6dfacc57-17e6-481e-bde6-36742bf2bb66,,Site 27,Site 27,,TRUE,,,,,,,,,,,,,,,,,,,
-2425adbe-b446-4d70-a684-5d757370a230,,Site 28,Site 28,,TRUE,,,,,,,,,,,,,,,,,,,
-d114a8ac-aa7e-4350-a8bf-de2caf0ea440,,Site 29,Site 29,,TRUE,,,,,,,,,,,,,,,,,,,
-ca22282f-0d68-4c1c-a985-90b69cf943a3,,Site 30,Site 30,,TRUE,,,,,,,,,,,,,,,,,,,
-8d976ed0-49fe-4ed9-909d-f7b9d4081712,,Site 31,Site 31,,TRUE,,,,,,,,,,,,,,,,,,,
-370c2cff-4681-40fa-bd29-b557399a6486,,Site 32,Site 32,,TRUE,,,,,,,,,,,,,,,,,,,
-3ad56ffe-05bc-4ccf-aa87-f517f65e10fd,,Site 33,Site 33,,TRUE,,,,,,,,,,,,,,,,,,,
-d38b9028-8035-4595-84ca-c8e7c9e2ecd4,,Site 34,Site 34,,TRUE,,,,,,,,,,,,,,,,,,,
-07032097-5031-4c93-a29a-52a14d124a0a,,Site 35,Site 35,,TRUE,,,,,,,,,,,,,,,,,,,
-aaf478f9-b3e2-4038-977b-56896a8060e2,,Site 36,Site 36,,TRUE,,,,,,,,,,,,,,,,,,,
-9a93ba80-8a44-4f99-980c-b1e13dbca33a,,Site 37,Site 37,,TRUE,,,,,,,,,,,,,,,,,,,
-5c0ff819-e936-4e75-9c1d-4d001a6fd95e,,Site 38,Site 38,,TRUE,,,,,,,,,,,,,,,,,,,
-743a7d4a-3404-49db-a0ec-beddbdec0919,,Site 39,Site 39,,TRUE,,,,,,,,,,,,,,,,,,,
-1b1317ae-3688-416d-a8f0-1378b92b9e04,,Site 40,Site 40,,TRUE,,,,,,,,,,,,,,,,,,,
-c2861e47-ecc1-4e81-992d-7b3c29fce0b0,,Site 41,Site 41,,TRUE,,,,,,,,,,,,,,,,,,,
-92dbdbdf-17da-4cf0-873c-ad15dfae71cb,,Site 42,Site 42,,TRUE,,,,,,,,,,,,,,,,,,,
-fd7fae67-7a2e-456c-81db-3cbdb10fd510,,Site 43,Site 43,,TRUE,,,,,,,,,,,,,,,,,,,
-2ccae22b-26ab-4c40-a813-55462e27a0c8,,Site 44,Site 44,,TRUE,,,,,,,,,,,,,,,,,,,
-2ef7caf2-affa-4003-8fe7-128db6ce31ee,,Site 45,Site 45,,TRUE,,,,,,,,,,,,,,,,,,,
-148dc112-9e26-42f9-b514-e28cf2e44b1f,,Site 46,Site 46,,TRUE,,,,,,,,,,,,,,,,,,,
-6d49188b-2bdf-4c6e-bdff-7eeed3e15a64,,Site 47,Site 47,,TRUE,,,,,,,,,,,,,,,,,,,
-0fa578fc-301a-418c-9cf9-b35707fcb478,,Site 48,Site 48,,TRUE,,,,,,,,,,,,,,,,,,,
-eeba7391-361a-41ad-a884-02d5504abaac,,Site 49,Site 49,,TRUE,,,,,,,,,,,,,,,,,,,
-2592d89f-8655-464e-bb76-5536d394c276,,Site 50,Site 50,,TRUE,,,,,,,,,,,,,,,,,,,
\ No newline at end of file
+dbdaabf6-a326-4804-aba7-062073e05cd1,,Site 1,Site 1,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+4a06a96f-dd21-4695-8d76-b9c405cebafc,,Site 2,Site 2,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+d493f3eb-ba7c-4e6c-988d-62491e496045,,Site 3,Site 3,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+dd2ad4cd-e33a-40cc-955a-e91e313f9a3b,,Site 4,Site 4,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+94346397-3848-4b92-9219-a981ed4265f8,,Site 5,Site 5,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+0566e68d-26ff-4e1d-a199-a9b8ecc3a7d4,,Site 6,Site 6,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+9ade8976-a178-4bce-a229-50cfcf61b87d,,Site 7,Site 7,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+50cfb6ca-a360-41f2-b3a0-7c5a19f4aa98,,Site 8,Site 8,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+d5be46a5-3afa-40fa-86ab-3c1ff31543e3,,Site 9,Site 9,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+5f47d469-7c8d-4f34-887c-16db797bec3d,,Site 10,Site 10,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+d81f9408-1582-4270-848f-6af319424733,,Site 11,Site 11,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+ffd78808-5b88-4a56-9c94-54754725ad90,,Site 12,Site 12,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+a61a5145-8da1-4410-be23-479314814cc7,,Site 13,Site 13,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+5e6abb9d-7ab3-4203-8b02-1462bcca0c51,,Site 14,Site 14,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+6536f254-a296-4d0f-84f7-9c0f0b12536e,,Site 15,Site 15,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+0cb740b2-153f-49e2-b599-aabb90330bd2,,Site 16,Site 16,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+2cead8f3-0e6c-468b-9f10-6a7ca75604dd,,Site 17,Site 17,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+facac3e6-8c4a-4528-a497-8cf22ffd1a50,,Site 18,Site 18,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+29fc4038-18d4-4b11-bc2b-63983932e6ac,,Site 19,Site 19,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+c84338a5-69a7-411a-aa0f-f405cb44697b,,Site 20,Site 20,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+09d08c88-5b12-4831-8268-62242822180d,,Site 21,Site 21,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+ac529390-16d6-4454-83be-4fcbbc5988aa,,Site 22,Site 22,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+b03c3107-fc5b-4b49-a31d-02bf327d6dd4,,Site 23,Site 23,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+302090a6-11ac-455d-80c9-08c06ebd1087,,Site 24,Site 24,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+bb5787d4-307e-40ec-89b3-f9f539a5d88f,,Site 25,Site 25,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+13ecc2c0-7170-4d51-a93d-7189fd885c05,,Site 26,Site 26,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+6dfacc57-17e6-481e-bde6-36742bf2bb66,,Site 27,Site 27,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+2425adbe-b446-4d70-a684-5d757370a230,,Site 28,Site 28,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+d114a8ac-aa7e-4350-a8bf-de2caf0ea440,,Site 29,Site 29,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+ca22282f-0d68-4c1c-a985-90b69cf943a3,,Site 30,Site 30,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+8d976ed0-49fe-4ed9-909d-f7b9d4081712,,Site 31,Site 31,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+370c2cff-4681-40fa-bd29-b557399a6486,,Site 32,Site 32,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+3ad56ffe-05bc-4ccf-aa87-f517f65e10fd,,Site 33,Site 33,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+d38b9028-8035-4595-84ca-c8e7c9e2ecd4,,Site 34,Site 34,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+07032097-5031-4c93-a29a-52a14d124a0a,,Site 35,Site 35,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+aaf478f9-b3e2-4038-977b-56896a8060e2,,Site 36,Site 36,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+9a93ba80-8a44-4f99-980c-b1e13dbca33a,,Site 37,Site 37,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+5c0ff819-e936-4e75-9c1d-4d001a6fd95e,,Site 38,Site 38,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+743a7d4a-3404-49db-a0ec-beddbdec0919,,Site 39,Site 39,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+1b1317ae-3688-416d-a8f0-1378b92b9e04,,Site 40,Site 40,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+c2861e47-ecc1-4e81-992d-7b3c29fce0b0,,Site 41,Site 41,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+92dbdbdf-17da-4cf0-873c-ad15dfae71cb,,Site 42,Site 42,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+fd7fae67-7a2e-456c-81db-3cbdb10fd510,,Site 43,Site 43,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+2ccae22b-26ab-4c40-a813-55462e27a0c8,,Site 44,Site 44,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+2ef7caf2-affa-4003-8fe7-128db6ce31ee,,Site 45,Site 45,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+148dc112-9e26-42f9-b514-e28cf2e44b1f,,Site 46,Site 46,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+6d49188b-2bdf-4c6e-bdff-7eeed3e15a64,,Site 47,Site 47,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+0fa578fc-301a-418c-9cf9-b35707fcb478,,Site 48,Site 48,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+eeba7391-361a-41ad-a884-02d5504abaac,,Site 49,Site 49,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
+2592d89f-8655-464e-bb76-5536d394c276,,Site 50,Site 50,,TRUE,TRUE,,,,,,,,,,,,,,,,,,
\ No newline at end of file