Fix features for new redirect behaviour