beremiz

Better writing of some xpath added in previous commits about XSLT optimization.