[BUG #8400]  Modified range selection implementation