cleaned QueryVocabularyValidator