Fix stream search

[finishes #67241182]