Simplified redirect logic