TQA-1254: improve reports organization