Updated matching code to handle flexible postal code placement