Further metainfo refactoring

Theodore Changrequested to merge
metainfo-small-fixes into develop

#2128 #1947

Edited by Theodore Chang

Merge request reports