Added some changes to how click events on names are handled.