fixing performance issues becuase of eager fetch and order of meanings