Fix ChoiceFilterSpec