Refactored urls using route #4391