Fixed hardcoded string, add restore state