new xsl for problematic cases