#150 improvements to xml exporter