Fixed issues with multiple types of choices