Tweaked postcode lookup
Fixed postcode trimming