Fix url back and add redirect