Faster report view with eager loading issue #8047