[OE-3261] fixed implementation of eager loading in query.