removed TODO to stream match results