bugfix for handling controlled vocabulary