Refactoring FilterByCategory