fix hierarchy; remove geo errors on valid