Updated selection listener