Fix issues with the vocabulary. refs #5860 (Affinitic)