Fixes in report view