Minor Performance improvments

Increased the performance (just a little bit) when uploading a report
without any attachments