Additional fixes for report map.