Make redirects more flexible