Fixed issue of updating states upon changed country
Restore address form in the original concept