improve metainfo handling