I have switched the feature selection option to a `choice` and pushed the changes to the fizzy branch.