Optimize filter
Remove report folder