Revised query for XmlFileExporter