If I understand this correctly, you convert all "contextValue" to "value" and the the remainder of the code assumes that "value" is the right option? This applies to both XML and JSON notifications?