Handle postalcode and countrycode better