[IMP] stock: more fault tolerant usage of xml id