Fixed issue with country form field