Bug fixes in map search screen