Fixes to use vocabs DB for lookup