Refactor location handling

Fix postalCode detection