Vocabulary field updates and persistence fix.