refactoring castom url helper
Merge branch 'develop' into staging