Feature/link controlled vocabs

closes #235