EDOC-599 : choices support