Updated/New Composer support for XML_Query2XML

See diff for full changes