- Revert "* modifications to URL generation method"