yet more channel filtering fixes