#734 Imrpove the label order