Use the appropriate type for the search bar
Clean up the map widget - Phase 4