sort_by_*_id -> sort
Merge pull request #327 from josenavas/sort

sort_by_*_id -> sort