Fix for handling xpaths during update.