Assign enumerator number on save(). Improved military address handling