Fix xml hydrator & response options