Added limitation of number of selections