Less aggressive selection clearing in highlightEntity