Fixed zip code bugs
MErging