Option sets are now selectable via dropdown
Merged