APD-160: hierarchy links fixed