Added support for visually indicating which entity is being selected