Add extra filter check