To rearrange your Place &/or Address parts there is the cunningly named plugin ‘Rearrange Address and Place Parts’.

That can adjust the number of comma-separated parts, move Address parts into Place parts, etc, etc, …