Changed some of the url shortening behaviour.