kleine Verbesserungen am MetadataController
Merge remote-tracking branch 'github/Mathias'