Improve map report