Feature/sort by name