- new filter fixes
- new query system