Links fixed, return url fixed