Store all choice tags as uppercase