filter activity refactor