Fix validation issue: nested blocks should not be saved from outer context