Zone tweaks

this is to take advantage of the UI, when you save a Zone you set a kind (country or state) so we just persist that value. The fallback is only there to make specs happy or say you're playing with this in console or a script and you didn't set the `kind`. Also adding explicit validations would make things more complicated than it needs to be right now.