user upload 500 fix + small improvement