fixes to reportview and mapper