Improve feature and steps
Update controller to use new select params