added additional id info to xpath, pending more memory leakage patch