combine city and postcode save logic