Handle the case where the sort descriptor is in the original entity