Fixed infowindow issues