Move selection event firing into updateSelection