DF-2765 fixes for editor