fix channel query
Merge branch 'master' into lichenxing