Selection logic improvements.