filterBy support fix