Fix xml response generation