Add default for missing params/keys in *_raw