Country codes

fixes #701 did this in a bit of a hurry, i have to update regex etc, but this should work for now.
Can you add tests for the exact strings used in the secondary_example_queries?