Fixes

Merged Paul Pestov requested to merge fixes into develop

fixes metadata default tab, small refactors

Merge request reports