fixed filter
All tests pass, merge finished