more changes for supporting infowindow templating