Merge pull request #211 from dennishendriksen/master

Do not expose non-system fields of system entities
fix app-lifelines call to FillMetaData