Move SortHelper to EnrichBundle