Fix for slow "choices" parse call