rhbz988202 - refactor filter