fix filtering issues