Updated logic of how to redirect when there is only a single redirect