Some filter performance improvements