Fix and add more effective version's sorting