More metadata speed improvements

Mitarrequested to merge
more-speed-improvements into devel

Fixes #164 (closed).

Edited by Mitar

Merge request reports