NXP-13015: be more accurate in xpath + use unique workspace name