MB-12558 - Fix for update statement

Ensure SET is applied at correct level, and that the top-enclosed
value does not get written to the datastore.