Some formatting fixes
Merge branch 'filtering' into doo