BsSelectFor and BsSelect refactoring