Add multiple vocabularies functionality
Bug fixing