Use improved query to limit number of eager loaded observations.