fixed filter performance issue