Fix Upload* display
Merge pull request #82 from nmaier/perf-fixes

Fix Upload* display