Include StreamIdOriginal when selecting streams for snapshotting and remove the StreamId paramater