Fix ds data and key data xml parsing