Fix bugs in upload
Show history in all cases