Re #1310 Improving links on search, and on object pages.