Fix regression with filtering