modify return url and hold language