refactoreed filters
cleanup
notes