MSS-100: Temporary workarounds for wrongly structured xml output coming from the backend