map now has one marker of each type with clickable infowindows