More filtering fixes.