More merge of duplicated code in visualization editor.