Added some more checks for opening/closing infowindows.