Correct Zip to Post Code and State to County for en-GB

Fixes #229