#GT-1053: fixed link creation