fix stream to work with filter groups