WIP: Feature/filter private data