Set country from properties file correctly

Also: properly check for country presence