Better postcode recognition, continuing to address #12