refactoring of scope filters