#master: xsl templates improved