Several fixes to filters