Fix thesaurus.
Use function to get label.
Merge remote-tracking branch 'origin/refactor_editorui' into refactor_editorui
Write the factory the simple way.