Improve www redirection [MJ-480]