Simpler graphs + filter pre/post
BugzId: 3166