Short URL fix