Fix aggregate id-to-label conversion instead of empty labels or nillable attribute
Merge pull request #1945 from dennishendriksen/master

Fix aggregate id-to-label conversion for empty labels or nillable attributes