[IMP] improve filter