fixes a potential bug that may incur crush when editing name;
fixes a shape reorder bug