Issue #217 modifies stream user searching