Entity SP: fixed infinite recursion while loading fields