Fixes to vocabulary controller and view; submodule updates