APD-182: object-list hierarchy fixed