Fixed some filtering