WIP fix search results in the stream