Replacing zip and state_id fields