Refactor get_choices_selected
Ready to new release