modify streamId management logic