fixed country selection issues