Improve reusability of QueryInput
and StreamsFilter
.
#20723
Merged
QueryInput
and StreamsFilter
.
#20723