Fix issue with url replace