Filter fix for 2.3.x

Migrated to 2.3.x.