more refactor of execution filter