SONAR-5333 Improve links consistency