[DF-666] is fixed + "type" field fix for UI controls currently not in editor.