fix choice handler when an element has no value