Test FE 2.0, and other fixes in Filter support, particularly related to SRS handling