[637/#1038] Org hierarchy rendered much faster now by code.