Fix restore from cookie feature