Changes in output xml to pass ANDS validation