Restoring hierarchy between saveXml and saveHtml