Sorting link with && bug fix