Shorten upload report
Take singulars into account