added more labels for metadata
fixed merge conflict