[#58929090] partial fix of links