Add filter ordering
am: c2e96d45d2

Change-Id: I9bc8994293a45684238c7d1377d30ef8c049ce81