ref #6905, #6597 further improvement on selection evaluation