Fixed short url problem