#997 - Make country fields dropdown