Changed default selection behavior again