updated filters; refactoring