[FIX] proper usage of map
Merge pull request #697 from timosachsenberg/feature/fix_map_usage

[FIX] proper usage of map in ControlledVocabulary