[FIX] XQuery, updating/%updating keywords, error conditions revised