B-48943 Updated filter code to accomodate new XSD