- Update Filter class
- Fix syntax errors