Fix city/state lookup