LPS-22792

LPS-22792 Restrict Vocabularies by subtypes