Fixes

* Revert super init call
+ Added limit_choices_to parameter