Fix infoWindow Bugs