Better touch support for Choice control