-- fix filtering