Fixed/improved filtering by category and region