This commit fixes problems in the XSLT. Results are still not valid.