Folders follow up

Initial follow-up, still some pending
`folders to which the collaborative document should be added`.