Fix for add country by using conditional logic