Fix issue with URL routes