New features in selecting number, bug fix