#694: Automatically pre-filling option keys, if they are null; fixed re-saving of option values;