Get rid of join
Redirect to right route