fix: change filter logic to avoid early returning

fix: change filter logic to avoid early returning #399