Fix ri speed, eager loading and n+1 queries