Fix sorting issue

TNL-952
yes this is ordered by value , also make changes again you can look into it now