Additionally sort by location name when possible