fixed choices so they save/display properly