Changes for shorturl and other improvements