Some more markup changes for short url.