Bug fix and allow name for country list filed