Folders follow up

Initial follow-up, still some pending
`Whether the content items in the folder should be deleted`