Adding none filter for country, and updating country count query