Add filters as in the test system