Last changes for report->view change
Note that database updates are required