CategoryFilterWrapper removed. Code changed to use CategoryFilter.