Remove some filtered out folders
Add some more filtering