Add the ability to sort results
Merge branch 'sortable' into develop