Redirect now picks the right url