Fix missed safeId usage