Revert "Revert "ATM the only way to make correct urls in related data links...""

This reverts commit fbb0ffaae84388d83bff587ed570d0c192aaaefb.