Improved MultiChoiceSerializer logic