Fix Order Set/List issue in UI