Move ToUpper calls from view to model where they should be