fix where User is not first object in mapping result