Changed the way filtering works.