Tweaked address form so blank country can be allowed to stay blank