Improved report logic