Updating Urls mapper to generate a redirect
Fixing code overflow.