[TASK] ADWD-1353-2 searchString revised to cater for new data

[TASK] ADWD-1353 split and revised search string for map
[TASK] ADWD-1353-2 searchString revised to cater for new data