AddFilter and RemoveFilter now working