Better support for number of selected items