Better handling of selected item table rows