Fixed some selection behaviour