Added support for shortened URL's