More xquote to quote