Options: changed logic of saving / loading of option values