Coerce change country_id to name. Fixes #154