Added filtering by category