Refactoring map search - info windows