[TASK] ADWD-1353 split and revised search string for map