Simplify redirect logic