Fix country selection bug on address checkout step