Filtering bug fix