Added "next" URL support