Replace itemId field by id