Updated some filtering