Simplified MapViewController by extracting search related code into its own class