CRM-15469, fixed country filter