Some small changes to restoration logic and default url