Refactor keyref XML filter to use super class code