Fix on filter by country