Some changes in the report for v2
Last fix if file doesn't exists