fix COMPONENT keys for restore also
Release 0.0.7; fixes #7