WIP: Feature/sortable search