Fix Analytics structures tree hierarchy

The hierarchy is only built at 1 level of depth. It should build on any level