Development

better performance of selection of items