fixed a bug in sort first underscore function
Merge branch 'hotfix' into uidev