further cleanup of the REST XML output