Improved country and state handling.