modified core Filter class