Added filtering by country