[WIP] note save structure fix