More changes related to InfoWindow