Fixed some selection problems