Add more filtering flags