Dont pass zip if NaN, convert states to abbr