correct sorting order / fix context links