Cleanup escaping in BoundView
Cleanup escaping in LinkView
Merge pull request #9998 from mmun/cleanup-escaping

Cleanup some more escaping