B-58212 Added a few more filters with configs