Some fixes for keywords, thesaurus, topicCategory and others