more filtering fixes