Added PreventRawFilter and optimisation of the prevent filter system