XML Export a little nicer than before