infowindow sources fix and clean