Explain Query - xpath support and clean-up