More xslt code, time to sanitize it a bit
Better handling of groups