Fixed issue with re - searching of the locations