minor cleaning
Metadata Hierarchy: better handling (not finished)