refactor executionfilter