Updated selection behaviour