Fix ID inconsistency for Data Manager