Minor changes
Add search on map