Added default sort on location