New country selector and better handling of +, 0, 00