Simplifed and fixed behaviour of selection.