fixes bug 908469 - more Metadata tab fixes
Merge pull request #1688 from peterbe/bug-908469-more-metadata-tab-fixes

fixes bug 908469 - more Metadata tab fixes