Standardized country filter
Bugfix