Fixing upload with stream id for any type