more channel filtering fixes