Changed capitalize hacks with replacing entered country name with a valid name from the validated country object