added XML conv support to Query
CHCS support to EP