Added correct selection with scrolling