SR 15048 - change to have city and state in separate fields