1237 Fix for bug: country guessing must be done with at least 2 chars

@viddo can you please review? thanks a lot