Correctly append links to all entities
Update docs