Remove filter dependency on manager