Added check for current URL