Fix filtering for 2.3.x