Merge pull request #5304 from ctiller/filter-selection

Decouple filter selection from channel construction