Refactored urls using rote #4391