Report View fixed (data issue + view adjusted)