Solved a few small bugs in selections