url-fix refactored