Slightly more robust handling of hierarchies. Major problem to tackle still is that to add a hierarchy to the query, the level nodes would need to be loaded first. Still have to solve that.
Slightly more robust handling of hierarchies. Major problem to tackle
still is that to add a hierarchy to the query, the level nodes would need
to be loaded first. Still have to solve that.

rpbouman/xavier,rpbouman/xavier