Fix expand on creation and expansion name editing bug