[March-04] Sort numbers and geometry component

Complete and Continue