Fixes #16 - Making country select faster