Selection statistics improvement (+ bugfix)