Fixed all url redirect problems