Demographic model improvements

[thomas.beale]

@borut.jures

As long as the US doesn’t start using openEHR and requesting ‘catalog’

Oh we would go with ‘catalog’, just to keep everyone happy.