bug fix: switch  ZIP and Address