small refatoring and add sorted desc/asc
Merge branch 'develop'