Issue36 controlled vocabulary