fixed comma
refactor last version that doesn't break the tests
fixed filter