Fixed surname conflict and not defined sorting