issue #20039: set state country in addressfields just like address