Made the selection work a bit better