correctly resolve choices field