Filter refactoring, added "Keep" filter