Fix subitem order