Remove dependency of request

currentUrl is passed from user