Folders follow up

Initial follow-up, still some pending
The `unrelatedLink` doesn't seem to be used. I think the goal was to make sure that content items that are also in the folder are not returned in a search when the query doesn't apply to them.