Fixed index paths for object updates when other changes affect updated object's index path.
Added support for nested contexts.