Some fixes and added some features to map search