Work on hierarchy builders
Make sure that no label is returned twice
Work on hierarchy builders
Merge branch 'master' into cleanup/importdata