Fix uAchieve metadata to use new entityId's