Updated selection behavior