Fix filters more.