Move conditional redirect to before filter