Synced code with upstream
Added count of entities
Added handling of hover on references
Rendering improvements