Added check to void address fields when a field higher in the hierarchy
is changed.