DataAPI: small fix in function set
MetadataTree: refactoring done