Update + Sort [RE-PULL]

@niksedk rebased try again.
Note: I used `ordinal` sorting which will help finding more non names