minor modify to filter exclude cases