Updating queries for the stream to be faster
Merge pull request #4769 from Ruxton/feature/faster_stream_queries

Updating queries for the stream to be faster