BugFix: only keep objects of datasets
Merge branch 'piechart'