XCOMMONS-449: Improve generic XML filter parser