Refactored urls #4391