entity link
Revert "entity link"

This reverts commit 60ddceee958bdbd154d839e89e4fd6ad2dcbc1ab.
Revert "entity link"

This reverts commit d47cb2192e683bd1e8b273bc8a95e16799817e6a.
new refactor