WL-2040 Use direct short url