Improving filters
Fix scripts