Fix #1023 by implementing filtering channel selectors