Merge branch 'FixedCountryIssue55and58' into 'master'

fixed country list issues 55 and 58

See merge request !46
Status Job ID Name Coverage
  Deploy
passed #1263
prod
job deploy prod

00:00:03