clean up and better urls for redirection [MJ-626]