Leave postcode before city swapping to JS

Fixes #6842