Fixing search by map issues