[VOV-1110] Fix handling of language terms & language codes