Fixed XML mapping for Query beans.