Fix filter issue