US529 - fix back button issue and improve XML output