Updated Query and XML

Updated Query and XML