Correct PU: add folder and family (fixes #4151)