Feature/improve url helper