Use aggregate scheduler filter

Change-Id: Ibd9e9668c091f90f549a4522acfb7ba9eac8120c