SONAR-5498 Make all links consistent