Fix for non-unique zipcodes