Fixed Apply redirect and Advanced back/cancel