Additional fixes for report map.
Merge remote-tracking branch 'origin/reports'