Issue 266: Allow stream query to be filterable

Fixes #266